<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173766] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173766">173766</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-09-19 11:43:14 -0700 (Fri, 19 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomTreeScopecpp">trunk/Source/WebCore/dom/TreeScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDragControllercpp">trunk/Source/WebCore/page/DragController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingHitTestRequesth">trunk/Source/WebCore/rendering/HitTestRequest.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageViewGestureGeometryCollectorcpp">trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173765 => 173766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-19 18:33:16 UTC (rev 173765)
+++ trunk/Source/WebCore/ChangeLog 2014-09-19 18:43:14 UTC (rev 173766)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-09-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow DOM methods to return references instead of pointers
</span></span></pre></div>
<a id="trunkSourceWebCoredomTreeScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TreeScope.cpp (173765 => 173766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TreeScope.cpp 2014-09-19 18:33:16 UTC (rev 173765)
+++ trunk/Source/WebCore/dom/TreeScope.cpp 2014-09-19 18:43:14 UTC (rev 173766)
</span><span class="lines">@@ -240,9 +240,8 @@
</span><span class="cx"> if (!visibleRect.contains(point))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</del><span class="cx"> HitTestResult result(point);
</span><del>- document->renderView()->hitTest(request, result);
</del><ins>+ document->renderView()->hitTest(HitTestRequest(), result);
</ins><span class="cx">
</span><span class="cx"> if (localPoint)
</span><span class="cx"> *localPoint = result.localPoint();
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (173765 => 173766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2014-09-19 18:33:16 UTC (rev 173765)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2014-09-19 18:43:14 UTC (rev 173766)
</span><span class="lines">@@ -1597,9 +1597,8 @@
</span><span class="cx"> if (!document->renderView())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</del><span class="cx"> HitTestResult result(point);
</span><del>- document->renderView()->hitTest(request, result);
</del><ins>+ document->renderView()->hitTest(HitTestRequest(), result);
</ins><span class="cx"> Node* innerNode = result.innerNode();
</span><span class="cx"> if (!innerNode || !innerNode->renderer())
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (173765 => 173766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2014-09-19 18:33:16 UTC (rev 173765)
+++ trunk/Source/WebCore/page/DragController.cpp 2014-09-19 18:43:14 UTC (rev 173766)
</span><span class="lines">@@ -286,9 +286,8 @@
</span><span class="cx"> float zoomFactor = frame ? frame->pageZoomFactor() : 1;
</span><span class="cx"> LayoutPoint point(p.x() * zoomFactor, p.y() * zoomFactor);
</span><span class="cx">
</span><del>- HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</del><span class="cx"> HitTestResult result(point);
</span><del>- documentUnderMouse->renderView()->hitTest(request, result);
</del><ins>+ documentUnderMouse->renderView()->hitTest(HitTestRequest(), result);
</ins><span class="cx">
</span><span class="cx"> Node* n = result.innerNode();
</span><span class="cx"> while (n && !n->isElementNode())
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (173765 => 173766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2014-09-19 18:33:16 UTC (rev 173765)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-09-19 18:43:14 UTC (rev 173766)
</span><span class="lines">@@ -840,9 +840,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_selectionInitiationState != ExtendedSelection) {
</span><del>- HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</del><span class="cx"> HitTestResult result(m_mouseDownPos);
</span><del>- m_frame.document()->renderView()->hitTest(request, result);
</del><ins>+ m_frame.document()->renderView()->hitTest(HitTestRequest(), result);
</ins><span class="cx">
</span><span class="cx"> updateSelectionForMouseDrag(result);
</span><span class="cx"> }
</span><span class="lines">@@ -1751,8 +1750,7 @@
</span><span class="cx"> // in case the scrollbar widget was destroyed when the mouse event was handled.
</span><span class="cx"> if (mouseEvent.scrollbar()) {
</span><span class="cx"> const bool wasLastScrollBar = mouseEvent.scrollbar() == m_lastScrollbarUnderMouse.get();
</span><del>- HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
- mouseEvent = m_frame.document()->prepareMouseEvent(request, documentPoint, platformMouseEvent);
</del><ins>+ mouseEvent = m_frame.document()->prepareMouseEvent(HitTestRequest(), documentPoint, platformMouseEvent);
</ins><span class="cx"> if (wasLastScrollBar && mouseEvent.scrollbar() != m_lastScrollbarUnderMouse.get())
</span><span class="cx"> m_lastScrollbarUnderMouse = nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -1770,10 +1768,8 @@
</span><span class="cx"> // If a mouse event handler changes the input element type to one that has a widget associated,
</span><span class="cx"> // we'd like to EventHandler::handleMousePressEvent to pass the event to the widget and thus the
</span><span class="cx"> // event target node can't still be the shadow node.
</span><del>- 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);
- }
</del><ins>+ if (mouseEvent.targetNode()->isShadowRoot() && isHTMLInputElement(toShadowRoot(mouseEvent.targetNode())->hostElement()))
+ mouseEvent = m_frame.document()->prepareMouseEvent(HitTestRequest(), documentPoint, platformMouseEvent);
</ins><span class="cx">
</span><span class="cx"> FrameView* view = m_frame.view();
</span><span class="cx"> Scrollbar* scrollbar = view ? view->scrollbarAtPoint(platformMouseEvent.position()) : 0;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingHitTestRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/HitTestRequest.h (173765 => 173766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/HitTestRequest.h 2014-09-19 18:33:16 UTC (rev 173765)
+++ trunk/Source/WebCore/rendering/HitTestRequest.h 2014-09-19 18:43:14 UTC (rev 173766)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> typedef unsigned HitTestRequestType;
</span><span class="cx">
</span><del>- HitTestRequest(HitTestRequestType requestType)
</del><ins>+ HitTestRequest(HitTestRequestType requestType = ReadOnly | Active | DisallowShadowContent)
</ins><span class="cx"> : m_requestType(requestType)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (173765 => 173766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-09-19 18:33:16 UTC (rev 173765)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-19 18:43:14 UTC (rev 173766)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-09-19 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Always assume internal SDK when building configuration Production
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageViewGestureGeometryCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp (173765 => 173766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp 2014-09-19 18:33:16 UTC (rev 173765)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp 2014-09-19 18:43:14 UTC (rev 173766)
</span><span class="lines">@@ -82,11 +82,10 @@
</span><span class="cx"> if (m_webPage.mainWebFrame()->handlesPageScaleGesture())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</del><span class="cx"> IntPoint originInContentsSpace = m_webPage.mainFrameView()->windowToContents(roundedIntPoint(origin));
</span><span class="cx"> HitTestResult hitTestResult = HitTestResult(originInContentsSpace);
</span><span class="cx">
</span><del>- m_webPage.mainFrameView()->renderView()->hitTest(request, hitTestResult);
</del><ins>+ m_webPage.mainFrameView()->renderView()->hitTest(HitTestRequest(), hitTestResult);
</ins><span class="cx">
</span><span class="cx"> if (Node* node = hitTestResult.innerNode()) {
</span><span class="cx"> bool isReplaced;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (173765 => 173766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-09-19 18:33:16 UTC (rev 173765)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-09-19 18:43:14 UTC (rev 173766)
</span><span class="lines">@@ -2246,10 +2246,8 @@
</span><span class="cx">
</span><span class="cx"> HitTestResult hitTestResult = HitTestResult(unobscuredContentRectCenter);
</span><span class="cx">
</span><del>- if (RenderView* mainFrameRenderView = frameView.renderView()) {
- HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
- mainFrameRenderView->hitTest(request, hitTestResult);
- }
</del><ins>+ if (RenderView* mainFrameRenderView = frameView.renderView())
+ mainFrameRenderView->hitTest(HitTestRequest(), hitTestResult);
</ins><span class="cx">
</span><span class="cx"> if (Node* node = hitTestResult.innerNode()) {
</span><span class="cx"> if (RenderObject* renderer = node->renderer()) {
</span></span></pre>
</div>
</div>
</body>
</html>