Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 0 insertions, 71 deletions

diff --git a/WebCore/platform/PlatformTouchPoint.h b/WebCore/platform/PlatformTouchPoint.h
deleted file mode 100644
index 82c8d78..0000000
--- a/WebCore/platform/PlatformTouchPoint.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-    Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef PlatformTouchPoint_h
-#define PlatformTouchPoint_h
-
-#include "IntPoint.h"
-#include <wtf/Vector.h>
-
-#if ENABLE(TOUCH_EVENTS)
-
-#if PLATFORM(QT)
-#include <QTouchEvent>
-#endif
-
-namespace WebCore {
-
-class PlatformTouchEvent;
-
-class PlatformTouchPoint {
-public:
-    enum State {
-        TouchReleased,
-        TouchPressed,
-        TouchMoved,
-        TouchStationary,
-        TouchCancelled
-    };
-
-#if PLATFORM(QT)
-    PlatformTouchPoint(const QTouchEvent::TouchPoint&);
-    PlatformTouchPoint() {};
-#elif PLATFORM(ANDROID)
-    PlatformTouchPoint(unsigned id, const IntPoint& windowPos, State);
-#elif PLATFORM(BREWMP)
-    PlatformTouchPoint(int id, const IntPoint& windowPos, State);
-#endif
-
-    unsigned id() const { return m_id; }
-    State state() const { return m_state; }
-    IntPoint screenPos() const { return m_screenPos; }
-    IntPoint pos() const { return m_pos; }
-    
-protected:
-    unsigned m_id;
-    State m_state;
-    IntPoint m_screenPos;
-    IntPoint m_pos;
-};
-
-}
-
-#endif // ENABLE(TOUCH_EVENTS)
-
-#endif // PlatformTouchPoint_h