Changeset 173766 in webkit

Timestamp:

Sep 19, 2014 11:43:14 AM (10 years ago)

Author:

Simon Fraser

Message:

Provide a default argument for the most commonly used HitTestRequest variant
​https://bugs.webkit.org/show_bug.cgi?id=136653

Reviewed by Darin Adler.

Make the default HitTestRequest flags be ReadOnly | Active | DisallowShadowContent
and change call sites using the default flags to use a HitTestRequest temporary.

Source/WebCore:

• dom/TreeScope.cpp:

(WebCore::nodeFromPoint):

• editing/FrameSelection.cpp:

(WebCore::FrameSelection::contains):

• page/DragController.cpp:

(WebCore::elementUnderMouse):

• page/EventHandler.cpp:

(WebCore::EventHandler::handleMouseDraggedEvent):
(WebCore::EventHandler::handleMousePressEvent):

• rendering/HitTestRequest.h:

(WebCore::HitTestRequest::HitTestRequest):

Source/WebKit2:

• WebProcess/WebPage/ViewGestureGeometryCollector.cpp:

(WebKit::ViewGestureGeometryCollector::collectGeometryForSmartMagnificationGesture):

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::dynamicViewportSizeUpdate):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/TreeScope.cpp (modified) (1 diff)
• WebCore/editing/FrameSelection.cpp (modified) (1 diff)
• WebCore/page/DragController.cpp (modified) (1 diff)
• WebCore/page/EventHandler.cpp (modified) (3 diffs)
• WebCore/rendering/HitTestRequest.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-19  Simon Fraser  <simon.fraser@apple.com>
+
+        Provide a default argument for the most commonly used HitTestRequest variant
+        https://bugs.webkit.org/show_bug.cgi?id=136653
+
+        Reviewed by Darin Adler.
+
+        Make the default HitTestRequest flags be ReadOnly | Active | DisallowShadowContent
+        and change call sites using the default flags to use a HitTestRequest temporary.
+
+        * dom/TreeScope.cpp:
+        (WebCore::nodeFromPoint):
+        * editing/FrameSelection.cpp:
+        (WebCore::FrameSelection::contains):
+        * page/DragController.cpp:
+        (WebCore::elementUnderMouse):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleMouseDraggedEvent):
+        (WebCore::EventHandler::handleMousePressEvent):
+        * rendering/HitTestRequest.h:
+        (WebCore::HitTestRequest::HitTestRequest):
+
 2014-09-19  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/dom/TreeScope.cpp

@@ -241 +241 @@
         return nullptr;
 
-    HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
     HitTestResult result(point);
-    document->renderView()->hitTest(request, result);
+    document->renderView()->hitTest(HitTestRequest(), result);
 
     if (localPoint)

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -1598 +1598 @@
         return false;
     
-    HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
     HitTestResult result(point);
-    document->renderView()->hitTest(request, result);
+    document->renderView()->hitTest(HitTestRequest(), result);
     Node* innerNode = result.innerNode();
     if (!innerNode || !innerNode->renderer())

trunk/Source/WebCore/page/DragController.cpp

@@ -287 +287 @@
     LayoutPoint point(p.x() * zoomFactor, p.y() * zoomFactor);
 
-    HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
     HitTestResult result(point);
-    documentUnderMouse->renderView()->hitTest(request, result);
+    documentUnderMouse->renderView()->hitTest(HitTestRequest(), result);
 
     Node* n = result.innerNode();

trunk/Source/WebCore/page/EventHandler.cpp

@@ -841 +841 @@
 
     if (m_selectionInitiationState != ExtendedSelection) {
-        HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
         HitTestResult result(m_mouseDownPos);
-        m_frame.document()->renderView()->hitTest(request, result);
+        m_frame.document()->renderView()->hitTest(HitTestRequest(), result);
 
         updateSelectionForMouseDrag(result);
@@ -1752 +1751 @@
     if (mouseEvent.scrollbar()) {
         const bool wasLastScrollBar = mouseEvent.scrollbar() == m_lastScrollbarUnderMouse.get();
-        HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
-        mouseEvent = m_frame.document()->prepareMouseEvent(request, documentPoint, platformMouseEvent);
+        mouseEvent = m_frame.document()->prepareMouseEvent(HitTestRequest(), documentPoint, platformMouseEvent);
         if (wasLastScrollBar && mouseEvent.scrollbar() != m_lastScrollbarUnderMouse.get())
             m_lastScrollbarUnderMouse = nullptr;
@@ -1771 +1769 @@
         // we'd like to EventHandler::handleMousePressEvent to pass the event to the widget and thus the
         // event target node can't still be the shadow node.
-        if (mouseEvent.targetNode()->isShadowRoot() && isHTMLInputElement(toShadowRoot(mouseEvent.targetNode())->hostElement())) {
-            HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
-            mouseEvent = m_frame.document()->prepareMouseEvent(request, documentPoint, platformMouseEvent);
-        }
+        if (mouseEvent.targetNode()->isShadowRoot() && isHTMLInputElement(toShadowRoot(mouseEvent.targetNode())->hostElement()))
+            mouseEvent = m_frame.document()->prepareMouseEvent(HitTestRequest(), documentPoint, platformMouseEvent);
 
         FrameView* view = m_frame.view();

trunk/Source/WebCore/rendering/HitTestRequest.h

@@ -45 +45 @@
     typedef unsigned HitTestRequestType;
 
-    HitTestRequest(HitTestRequestType requestType)
+    HitTestRequest(HitTestRequestType requestType = ReadOnly | Active | DisallowShadowContent)
         : m_requestType(requestType)
     {

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-09-19  Simon Fraser  <simon.fraser@apple.com>
+
+        Provide a default argument for the most commonly used HitTestRequest variant
+        https://bugs.webkit.org/show_bug.cgi?id=136653
+
+        Reviewed by Darin Adler.
+
+        Make the default HitTestRequest flags be ReadOnly | Active | DisallowShadowContent
+        and change call sites using the default flags to use a HitTestRequest temporary.
+
+        * WebProcess/WebPage/ViewGestureGeometryCollector.cpp:
+        (WebKit::ViewGestureGeometryCollector::collectGeometryForSmartMagnificationGesture):
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::dynamicViewportSizeUpdate):
+
 2014-09-19  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp

@@ -83 +83 @@
         return;
 
-    HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
     IntPoint originInContentsSpace = m_webPage.mainFrameView()->windowToContents(roundedIntPoint(origin));
     HitTestResult hitTestResult = HitTestResult(originInContentsSpace);
 
-    m_webPage.mainFrameView()->renderView()->hitTest(request, hitTestResult);
+    m_webPage.mainFrameView()->renderView()->hitTest(HitTestRequest(), hitTestResult);
 
     if (Node* node = hitTestResult.innerNode()) {

trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -2247 +2247 @@
         HitTestResult hitTestResult = HitTestResult(unobscuredContentRectCenter);
 
-        if (RenderView* mainFrameRenderView = frameView.renderView()) {
-            HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
-            mainFrameRenderView->hitTest(request, hitTestResult);
-        }
+        if (RenderView* mainFrameRenderView = frameView.renderView())
+            mainFrameRenderView->hitTest(HitTestRequest(), hitTestResult);
 
         if (Node* node = hitTestResult.innerNode()) {