tizen beta release

[framework/web/webkit-efl.git] / Source / WebCore / dom / MouseRelatedEvent.cpp

diff --git a/Source/WebCore/dom/MouseRelatedEvent.cpp b/Source/WebCore/dom/MouseRelatedEvent.cpp
index 515554f..c4b1444 100755 (executable)
--- a/Source/WebCore/dom/MouseRelatedEvent.cpp
+++ b/Source/WebCore/dom/MouseRelatedEvent.cpp
@@ -53,10 +53,16 @@ static LayoutSize contentsScrollOffset(AbstractView* abstractView)
 }
 
 MouseRelatedEvent::MouseRelatedEvent(const AtomicString& eventType, bool canBubble, bool cancelable, PassRefPtr<AbstractView> abstractView,
-                                     int detail, const LayoutPoint& screenLocation, const LayoutPoint& windowLocation,
+                                     int detail, const IntPoint& screenLocation, const IntPoint& windowLocation,
+#if ENABLE(POINTER_LOCK)
+                                     const IntPoint& movementDelta,
+#endif
                                      bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool isSimulated)
     : UIEventWithKeyState(eventType, canBubble, cancelable, abstractView, detail, ctrlKey, altKey, shiftKey, metaKey)
     , m_screenLocation(screenLocation)
+#if ENABLE(POINTER_LOCK)
+    , m_movementDelta(movementDelta)
+#endif
     , m_isSimulated(isSimulated)
 {
     LayoutPoint adjustedPageLocation;
@@ -80,7 +86,7 @@ MouseRelatedEvent::MouseRelatedEvent(const AtomicString& eventType, bool canBubb
         }
     }
 
-    m_clientLocation = adjustedPageLocation - toSize(scrollPosition);
+    m_clientLocation = adjustedPageLocation - toLayoutSize(scrollPosition);
     m_pageLocation = adjustedPageLocation;
 
     initCoordinates();
@@ -181,7 +187,7 @@ void MouseRelatedEvent::computeRelativePosition()
     if (n && (layer = n->renderer()->enclosingLayer())) {
         layer->updateLayerPosition();
         for (; layer; layer = layer->parent()) {
-            m_layerLocation -= toSize(layer->location());
+            m_layerLocation -= toLayoutSize(layer->location());
         }
     }