Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / dom / Touch.h

diff --git a/src/third_party/WebKit/Source/core/dom/Touch.h b/src/third_party/WebKit/Source/core/dom/Touch.h
index c4896bb..2a76e6a 100644 (file)
--- a/src/third_party/WebKit/Source/core/dom/Touch.h
+++ b/src/third_party/WebKit/Source/core/dom/Touch.h
@@ -26,7 +26,7 @@
 #ifndef Touch_h
 #define Touch_h
 
-#include "bindings/v8/ScriptWrappable.h"
+#include "bindings/core/v8/ScriptWrappable.h"
 #include "core/events/EventTarget.h"
 #include "platform/geometry/FloatPoint.h"
 #include "platform/geometry/FloatSize.h"
@@ -36,11 +36,11 @@
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 
-namespace WebCore {
+namespace blink {
 
 class LocalFrame;
 
-class Touch FINAL : public RefCountedWillBeGarbageCollectedFinalized<Touch>, public ScriptWrappable {
+class Touch FINAL : public RefCountedWillBeGarbageCollected<Touch>, public ScriptWrappable {
 public:
     static PassRefPtrWillBeRawPtr<Touch> create(LocalFrame* frame, EventTarget* target,
         unsigned identifier, const FloatPoint& screenPos, const FloatPoint& pagePos,
@@ -59,9 +59,12 @@ public:
     double screenY() const { return m_screenPos.y(); }
     double pageX() const { return m_pagePos.x(); }
     double pageY() const { return m_pagePos.y(); }
+    double radiusX() const { return m_radius.width(); }
     double webkitRadiusX() const { return m_radius.width(); }
+    double radiusY() const { return m_radius.height(); }
     double webkitRadiusY() const { return m_radius.height(); }
     float webkitRotationAngle() const { return m_rotationAngle; }
+    float force() const { return m_force; }
     float webkitForce() const { return m_force; }
 
     // Blink-internal methods
@@ -98,6 +101,6 @@ private:
     LayoutPoint m_absoluteLocation;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif /* Touch_h */