Changeset 83414 in webkit

Timestamp:

Apr 10, 2011 7:21:40 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-10 Alice Boxhall <​aboxhall@chromium.org>

Reviewed by Ryosuke Niwa.

Change EventHandler::updateSelectionForMouseDrag to take a HitTestResult only.
​https://bugs.webkit.org/show_bug.cgi?id=57923

Change EventHandler::updateSelectionForMouseDrag to take a HitTestResult
rather than a Node* and an IntPoint&, as the selection may actually not
extend into the Node found by the HitTest.

No new tests. Refactoring only.

• page/EventHandler.cpp: (WebCore::EventHandler::handleMouseDraggedEvent): (WebCore::EventHandler::updateSelectionForMouseDrag):
• page/EventHandler.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/EventHandler.cpp (modified) (3 diffs)
• page/EventHandler.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-10  Alice Boxhall  <aboxhall@chromium.org>
+
+        Reviewed by Ryosuke Niwa.
+
+        Change EventHandler::updateSelectionForMouseDrag to take a HitTestResult only.
+        https://bugs.webkit.org/show_bug.cgi?id=57923
+
+        Change EventHandler::updateSelectionForMouseDrag to take a HitTestResult
+        rather than a Node* and an IntPoint&, as the selection may actually not
+        extend into the Node found by the HitTest.
+
+        No new tests. Refactoring only.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleMouseDraggedEvent):
+        (WebCore::EventHandler::updateSelectionForMouseDrag):
+        * page/EventHandler.h:
+
 2011-04-10  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -567 +567 @@
         HitTestResult result(m_mouseDownPos);
         m_frame->document()->renderView()->layer()->hitTest(request, result);
-        updateSelectionForMouseDrag(result.innerNode(), result.localPoint());
-    }
-    updateSelectionForMouseDrag(targetNode, event.localPoint());
+
+        updateSelectionForMouseDrag(result);
+    }
+    updateSelectionForMouseDrag(event.hitTestResult());
     return true;
 }
@@ -619 +620 @@
     HitTestResult result(view->windowToContents(m_currentMousePosition));
     layer->hitTest(request, result);
-    updateSelectionForMouseDrag(result.innerNode(), result.localPoint());
-}
-
-void EventHandler::updateSelectionForMouseDrag(Node* targetNode, const IntPoint& localPoint)
+    updateSelectionForMouseDrag(result);
+}
+
+void EventHandler::updateSelectionForMouseDrag(const HitTestResult& hitTestResult)
 {
     if (!m_mouseDownMayStartSelect)
         return;
 
-    if (!targetNode)
+    Node* target = targetNode(hitTestResult);
+    if (!target)
         return;
 
-    if (!canMouseDragExtendSelect(targetNode))
+    if (!canMouseDragExtendSelect(target))
         return;
 
-    RenderObject* targetRenderer = targetNode->renderer();
+    RenderObject* targetRenderer = target->renderer();
     if (!targetRenderer)
         return;
 
-    VisiblePosition targetPosition(targetRenderer->positionForPoint(localPoint));
+    VisiblePosition targetPosition = targetRenderer->positionForPoint(hitTestResult.localPoint());
 
     // Don't modify the selection if we're not on a node.
@@ -653 +655 @@
         if (RenderObject* selectionBaseRenderer = selectionBaseNode->renderer())
             if (selectionBaseRenderer->isSVGText())
-                if (targetNode->renderer()->containingBlock() != selectionBaseRenderer->containingBlock())
+                if (target->renderer()->containingBlock() != selectionBaseRenderer->containingBlock())
                     return;
 #endif

trunk/Source/WebCore/page/EventHandler.h

@@ -361 +361 @@
 
 #if ENABLE(DRAG_SUPPORT)
-    void updateSelectionForMouseDrag(Node* targetNode, const IntPoint& localPoint);
+    void updateSelectionForMouseDrag(const HitTestResult&);
 #endif