<!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>[200540] 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/200540">200540</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-06 23:03:50 -0700 (Fri, 06 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename HitTestRequest DisallowShadowContent to DisallowUserAgentShadowContent
https://bugs.webkit.org/show_bug.cgi?id=157447
Reviewed by Ryosuke Niwa.
Source/WebCore:
HitTesting is intended to reach nodes inside shadow content. This property
on the HitTestRequest is intended to avoid hit testing in UserAgent shadow
content. Rename the enum value, and cascading methods for clarity.
* html/MediaElementSession.cpp:
(WebCore::isMainContent):
* page/EventHandler.cpp:
(WebCore::EventHandler::eventMayStartDrag):
(WebCore::EventHandler::updateSelectionForMouseDrag):
(WebCore::EventHandler::hitTestResultAtPoint):
(WebCore::EventHandler::handleMousePressEvent):
(WebCore::EventHandler::handleMouseDoubleClickEvent):
(WebCore::EventHandler::mouseMoved):
(WebCore::EventHandler::handleMouseMoveEvent):
(WebCore::EventHandler::handleMouseReleaseEvent):
(WebCore::EventHandler::handleMouseForceEvent):
(WebCore::EventHandler::updateDragAndDrop):
(WebCore::EventHandler::isInsideScrollbar):
(WebCore::EventHandler::sendContextMenuEvent):
(WebCore::EventHandler::sendContextMenuEventForKey):
(WebCore::EventHandler::hoverTimerFired):
(WebCore::EventHandler::dragSourceEndedAt):
(WebCore::EventHandler::handleDrag):
(WebCore::EventHandler::dispatchSyntheticTouchEventIfEnabled):
* page/EventHandler.h:
* page/FocusController.cpp:
(WebCore::updateFocusCandidateIfNeeded):
* rendering/HitTestRequest.h:
(WebCore::HitTestRequest::HitTestRequest):
(WebCore::HitTestRequest::disallowsUserAgentShadowContent):
(WebCore::HitTestRequest::disallowsShadowContent): Deleted.
* rendering/HitTestResult.cpp:
(WebCore::HitTestResult::setToNonUserAgentShadowAncestor):
(WebCore::HitTestResult::addNodeToRectBasedTestResult):
(WebCore::HitTestResult::setToNonShadowAncestor): Deleted.
* rendering/HitTestResult.h:
* rendering/RenderEmbeddedObject.cpp:
(WebCore::RenderEmbeddedObject::isReplacementObscured):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects):
* rendering/svg/RenderSVGResourceClipper.cpp:
(WebCore::RenderSVGResourceClipper::hitTestClipContent):
* testing/Internals.cpp:
(WebCore::Internals::nodesFromRect):
Source/WebKit/mac:
* WebView/WebFrame.mm:
(-[WebFrame elementAtPoint:]):
* WebView/WebHTMLView.mm:
(-[WebHTMLView elementAtPoint:allowShadowContent:]):
Source/WebKit/win:
* WebView.cpp:
(WebView::gestureNotify):
Source/WebKit2:
* WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp:
(WebKit::WebPage::findZoomableAreaForPoint):
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::hitTest):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::determinePrimarySnapshottedPlugIn):
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::rangeForWebSelectionAtPosition):
(WebKit::WebPage::rangeForBlockAtPoint):
(WebKit::WebPage::getPositionInformation):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaElementSessioncpp">trunk/Source/WebCore/html/MediaElementSession.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlerh">trunk/Source/WebCore/page/EventHandler.h</a></li>
<li><a href="#trunkSourceWebCorepageFocusControllercpp">trunk/Source/WebCore/page/FocusController.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingHitTestRequesth">trunk/Source/WebCore/rendering/HitTestRequest.h</a></li>
<li><a href="#trunkSourceWebCorerenderingHitTestResultcpp">trunk/Source/WebCore/rendering/HitTestResult.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingHitTestResulth">trunk/Source/WebCore/rendering/HitTestResult.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderEmbeddedObjectcpp">trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceClippercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsWebPageCoordinatedGraphicscpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebFramecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.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 (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebCore/ChangeLog 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -1,5 +1,57 @@
</span><span class="cx"> 2016-05-06 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Rename HitTestRequest DisallowShadowContent to DisallowUserAgentShadowContent
+ https://bugs.webkit.org/show_bug.cgi?id=157447
+
+ Reviewed by Ryosuke Niwa.
+
+ HitTesting is intended to reach nodes inside shadow content. This property
+ on the HitTestRequest is intended to avoid hit testing in UserAgent shadow
+ content. Rename the enum value, and cascading methods for clarity.
+
+ * html/MediaElementSession.cpp:
+ (WebCore::isMainContent):
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::eventMayStartDrag):
+ (WebCore::EventHandler::updateSelectionForMouseDrag):
+ (WebCore::EventHandler::hitTestResultAtPoint):
+ (WebCore::EventHandler::handleMousePressEvent):
+ (WebCore::EventHandler::handleMouseDoubleClickEvent):
+ (WebCore::EventHandler::mouseMoved):
+ (WebCore::EventHandler::handleMouseMoveEvent):
+ (WebCore::EventHandler::handleMouseReleaseEvent):
+ (WebCore::EventHandler::handleMouseForceEvent):
+ (WebCore::EventHandler::updateDragAndDrop):
+ (WebCore::EventHandler::isInsideScrollbar):
+ (WebCore::EventHandler::sendContextMenuEvent):
+ (WebCore::EventHandler::sendContextMenuEventForKey):
+ (WebCore::EventHandler::hoverTimerFired):
+ (WebCore::EventHandler::dragSourceEndedAt):
+ (WebCore::EventHandler::handleDrag):
+ (WebCore::EventHandler::dispatchSyntheticTouchEventIfEnabled):
+ * page/EventHandler.h:
+ * page/FocusController.cpp:
+ (WebCore::updateFocusCandidateIfNeeded):
+ * rendering/HitTestRequest.h:
+ (WebCore::HitTestRequest::HitTestRequest):
+ (WebCore::HitTestRequest::disallowsUserAgentShadowContent):
+ (WebCore::HitTestRequest::disallowsShadowContent): Deleted.
+ * rendering/HitTestResult.cpp:
+ (WebCore::HitTestResult::setToNonUserAgentShadowAncestor):
+ (WebCore::HitTestResult::addNodeToRectBasedTestResult):
+ (WebCore::HitTestResult::setToNonShadowAncestor): Deleted.
+ * rendering/HitTestResult.h:
+ * rendering/RenderEmbeddedObject.cpp:
+ (WebCore::RenderEmbeddedObject::isReplacementObscured):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/svg/RenderSVGResourceClipper.cpp:
+ (WebCore::RenderSVGResourceClipper::hitTestClipContent):
+ * testing/Internals.cpp:
+ (WebCore::Internals::nodesFromRect):
+
+2016-05-06 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Inspect Element and Element Selection searching should work with Shadow DOM Nodes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157446
</span><span class="cx"> <rdar://problem/24688447>
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaElementSession.cpp 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -530,7 +530,7 @@
</span><span class="cx"> IntRect rectRelativeToView = element.clientRect();
</span><span class="cx"> ScrollPosition scrollPosition = mainFrame.view()->documentScrollPositionRelativeToViewOrigin();
</span><span class="cx"> IntRect rectRelativeToTopDocument(rectRelativeToView.location() + scrollPosition, rectRelativeToView.size());
</span><del>- HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::AllowChildFrameContent | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowShadowContent);
</del><ins>+ HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::AllowChildFrameContent | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx"> HitTestResult result(rectRelativeToTopDocument.center());
</span><span class="cx">
</span><span class="cx"> // Elements which are obscured by other elements cannot be main content.
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -880,7 +880,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> updateDragSourceActionsAllowed();
</span><del>- HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::DisallowShadowContent);
</del><ins>+ HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx"> HitTestResult result(view->windowToContents(event.position()));
</span><span class="cx"> renderView->hitTest(request, result);
</span><span class="cx"> DragState state;
</span><span class="lines">@@ -896,7 +896,7 @@
</span><span class="cx"> if (!renderView)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::Move | HitTestRequest::DisallowShadowContent);
</del><ins>+ HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::Move | HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx"> HitTestResult result(view->windowToContents(m_lastKnownMousePosition));
</span><span class="cx"> renderView->hitTest(request, result);
</span><span class="cx"> updateSelectionForMouseDrag(result);
</span><span class="lines">@@ -1143,8 +1143,8 @@
</span><span class="cx"> if (!request.readOnly())
</span><span class="cx"> m_frame.document()->updateHoverActiveState(request, result.innerElement());
</span><span class="cx">
</span><del>- if (request.disallowsShadowContent())
- result.setToNonShadowAncestor();
</del><ins>+ if (request.disallowsUserAgentShadowContent())
+ result.setToNonUserAgentShadowAncestor();
</ins><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -1636,7 +1636,7 @@
</span><span class="cx"> }
</span><span class="cx"> m_mouseDownWasInSubframe = false;
</span><span class="cx">
</span><del>- HitTestRequest request(HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</del><ins>+ HitTestRequest request(HitTestRequest::Active | HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx"> // Save the document point we generate in case the window coordinate is invalidated by what happens
</span><span class="cx"> // when we dispatch the event.
</span><span class="cx"> LayoutPoint documentPoint = documentPointForWindowPoint(m_frame, platformMouseEvent.position());
</span><span class="lines">@@ -1744,7 +1744,7 @@
</span><span class="cx"> m_mousePressed = false;
</span><span class="cx"> setLastKnownMousePosition(platformMouseEvent);
</span><span class="cx">
</span><del>- HitTestRequest request(HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</del><ins>+ HitTestRequest request(HitTestRequest::Active | HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx"> MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(request, platformMouseEvent);
</span><span class="cx"> Frame* subframe = subframeForHitTestResult(mouseEvent);
</span><span class="cx"> if (m_eventHandlerWillResetCapturingMouseEventsElement)
</span><span class="lines">@@ -1814,7 +1814,7 @@
</span><span class="cx"> if (FrameView* frameView = m_frame.view())
</span><span class="cx"> frameView->mouseMovedInContentArea();
</span><span class="cx">
</span><del>- hoveredNode.setToNonShadowAncestor();
</del><ins>+ hoveredNode.setToNonUserAgentShadowAncestor();
</ins><span class="cx"> page->chrome().mouseDidMoveOverElement(hoveredNode, event.modifierFlags());
</span><span class="cx"> page->chrome().setToolTip(hoveredNode);
</span><span class="cx"> return result;
</span><span class="lines">@@ -1864,7 +1864,7 @@
</span><span class="cx"> return m_lastScrollbarUnderMouse->mouseMoved(platformMouseEvent);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- HitTestRequest::HitTestRequestType hitType = HitTestRequest::Move | HitTestRequest::DisallowShadowContent | HitTestRequest::AllowFrameScrollbars;
</del><ins>+ HitTestRequest::HitTestRequestType hitType = HitTestRequest::Move | HitTestRequest::DisallowUserAgentShadowContent | HitTestRequest::AllowFrameScrollbars;
</ins><span class="cx"> if (m_mousePressed)
</span><span class="cx"> hitType |= HitTestRequest::Active;
</span><span class="cx"> else if (onlyUpdateScrollbars) {
</span><span class="lines">@@ -1998,7 +1998,7 @@
</span><span class="cx"> return !dispatchMouseEvent(eventNames().mouseupEvent, m_lastElementUnderMouse.get(), cancelable, m_clickCount, platformMouseEvent, setUnder);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- HitTestRequest request(HitTestRequest::Release | HitTestRequest::DisallowShadowContent);
</del><ins>+ HitTestRequest request(HitTestRequest::Release | HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx"> MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(request, platformMouseEvent);
</span><span class="cx"> Frame* subframe = m_capturingMouseEventsElement.get() ? subframeForTargetNode(m_capturingMouseEventsElement.get()) : subframeForHitTestResult(mouseEvent);
</span><span class="cx"> if (m_eventHandlerWillResetCapturingMouseEventsElement)
</span><span class="lines">@@ -2035,7 +2035,7 @@
</span><span class="cx">
</span><span class="cx"> setLastKnownMousePosition(event);
</span><span class="cx">
</span><del>- HitTestRequest::HitTestRequestType hitType = HitTestRequest::DisallowShadowContent | HitTestRequest::Active;
</del><ins>+ HitTestRequest::HitTestRequestType hitType = HitTestRequest::DisallowUserAgentShadowContent | HitTestRequest::Active;
</ins><span class="cx">
</span><span class="cx"> HitTestRequest request(hitType);
</span><span class="cx"> MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(request, event);
</span><span class="lines">@@ -2193,7 +2193,7 @@
</span><span class="cx"> if (!m_frame.view())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::DisallowShadowContent);
</del><ins>+ HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx"> MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(request, event);
</span><span class="cx">
</span><span class="cx"> RefPtr<Element> newTarget;
</span><span class="lines">@@ -2522,7 +2522,7 @@
</span><span class="cx"> bool EventHandler::isInsideScrollbar(const IntPoint& windowPoint) const
</span><span class="cx"> {
</span><span class="cx"> if (RenderView* renderView = m_frame.contentRenderer()) {
</span><del>- HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::DisallowShadowContent);
</del><ins>+ HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx"> HitTestResult result(windowPoint);
</span><span class="cx"> renderView->hitTest(request, result);
</span><span class="cx"> return result.scrollbar();
</span><span class="lines">@@ -2740,7 +2740,7 @@
</span><span class="cx"> m_mousePressed = false;
</span><span class="cx"> bool swallowEvent;
</span><span class="cx"> LayoutPoint viewportPos = view->windowToContents(event.position());
</span><del>- HitTestRequest request(HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</del><ins>+ HitTestRequest request(HitTestRequest::Active | HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx"> MouseEventWithHitTestResults mouseEvent = doc->prepareMouseEvent(request, viewportPos, event);
</span><span class="cx">
</span><span class="cx"> // Do not show context menus when clicking on scrollbars.
</span><span class="lines">@@ -2820,7 +2820,7 @@
</span><span class="cx"> // Use the focused node as the target for hover and active.
</span><span class="cx"> HitTestResult result(position);
</span><span class="cx"> result.setInnerNode(targetNode);
</span><del>- doc->updateHoverActiveState(HitTestRequest::Active | HitTestRequest::DisallowShadowContent, result.innerElement());
</del><ins>+ doc->updateHoverActiveState(HitTestRequest::Active | HitTestRequest::DisallowUserAgentShadowContent, result.innerElement());
</ins><span class="cx">
</span><span class="cx"> // The contextmenu event is a mouse event even when invoked using the keyboard.
</span><span class="cx"> // This is required for web compatibility.
</span><span class="lines">@@ -2937,7 +2937,7 @@
</span><span class="cx">
</span><span class="cx"> if (RenderView* renderView = m_frame.contentRenderer()) {
</span><span class="cx"> if (FrameView* view = m_frame.view()) {
</span><del>- HitTestRequest request(HitTestRequest::Move | HitTestRequest::DisallowShadowContent);
</del><ins>+ HitTestRequest request(HitTestRequest::Move | HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx"> HitTestResult result(view->windowToContents(m_lastKnownMousePosition));
</span><span class="cx"> renderView->hitTest(request, result);
</span><span class="cx"> m_frame.document()->updateHoverActiveState(request, result.innerElement());
</span><span class="lines">@@ -3316,7 +3316,7 @@
</span><span class="cx"> void EventHandler::dragSourceEndedAt(const PlatformMouseEvent& event, DragOperation operation)
</span><span class="cx"> {
</span><span class="cx"> // Send a hit test request so that RenderLayer gets a chance to update the :hover and :active pseudoclasses.
</span><del>- HitTestRequest request(HitTestRequest::Release | HitTestRequest::DisallowShadowContent);
</del><ins>+ HitTestRequest request(HitTestRequest::Release | HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx"> prepareMouseEvent(request, event);
</span><span class="cx">
</span><span class="cx"> if (dragState().source && dragState().shouldDispatchEvents) {
</span><span class="lines">@@ -3369,7 +3369,7 @@
</span><span class="cx"> dragState().shouldDispatchEvents = (updateDragSourceActionsAllowed() & DragSourceActionDHTML);
</span><span class="cx">
</span><span class="cx"> // try to find an element that wants to be dragged
</span><del>- HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::DisallowShadowContent);
</del><ins>+ HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx"> HitTestResult result(m_mouseDownPos);
</span><span class="cx"> m_frame.contentRenderer()->hitTest(request, result);
</span><span class="cx"> if (m_frame.page())
</span><span class="lines">@@ -3964,7 +3964,7 @@
</span><span class="cx"> if (eventType != PlatformEvent::MouseMoved && eventType != PlatformEvent::MousePressed && eventType != PlatformEvent::MouseReleased)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- HitTestRequest request(HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</del><ins>+ HitTestRequest request(HitTestRequest::Active | HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx"> MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(request, platformMouseEvent);
</span><span class="cx"> if (mouseEvent.scrollbar() || subframeForHitTestResult(mouseEvent))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.h (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.h 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebCore/page/EventHandler.h 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> void dispatchFakeMouseMoveEventSoonInQuad(const FloatQuad&);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT HitTestResult hitTestResultAtPoint(const LayoutPoint&,
</span><del>- HitTestRequest::HitTestRequestType hitType = HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent,
</del><ins>+ HitTestRequest::HitTestRequestType hitType = HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowUserAgentShadowContent,
</ins><span class="cx"> const LayoutSize& padding = LayoutSize());
</span><span class="cx">
</span><span class="cx"> bool mousePressed() const { return m_mousePressed; }
</span></span></pre></div>
<a id="trunkSourceWebCorepageFocusControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FocusController.cpp (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FocusController.cpp 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebCore/page/FocusController.cpp 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -816,7 +816,7 @@
</span><span class="cx"> // If 2 nodes are intersecting, do hit test to find which node in on top.
</span><span class="cx"> LayoutUnit x = intersectionRect.x() + intersectionRect.width() / 2;
</span><span class="cx"> LayoutUnit y = intersectionRect.y() + intersectionRect.height() / 2;
</span><del>- HitTestResult result = candidate.visibleNode->document().page()->mainFrame().eventHandler().hitTestResultAtPoint(IntPoint(x, y), HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowShadowContent);
</del><ins>+ HitTestResult result = candidate.visibleNode->document().page()->mainFrame().eventHandler().hitTestResultAtPoint(IntPoint(x, y), HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx"> if (candidate.visibleNode->contains(result.innerNode())) {
</span><span class="cx"> closest = candidate;
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingHitTestRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/HitTestRequest.h (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/HitTestRequest.h 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebCore/rendering/HitTestRequest.h 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> IgnoreClipping = 1 << 5,
</span><span class="cx"> SVGClipContent = 1 << 6,
</span><span class="cx"> TouchEvent = 1 << 7,
</span><del>- DisallowShadowContent = 1 << 8,
</del><ins>+ DisallowUserAgentShadowContent = 1 << 8,
</ins><span class="cx"> AllowFrameScrollbars = 1 << 9,
</span><span class="cx"> AllowChildFrameContent = 1 << 10,
</span><span class="cx"> ChildFrameHitTest = 1 << 11,
</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 = ReadOnly | Active | DisallowShadowContent)
</del><ins>+ HitTestRequest(HitTestRequestType requestType = ReadOnly | Active | DisallowUserAgentShadowContent)
</ins><span class="cx"> : m_requestType(requestType)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> bool svgClipContent() const { return m_requestType & SVGClipContent; }
</span><span class="cx"> bool touchEvent() const { return m_requestType & TouchEvent; }
</span><span class="cx"> bool mouseEvent() const { return !touchEvent(); }
</span><del>- bool disallowsShadowContent() const { return m_requestType & DisallowShadowContent; }
</del><ins>+ bool disallowsUserAgentShadowContent() const { return m_requestType & DisallowUserAgentShadowContent; }
</ins><span class="cx"> bool allowsFrameScrollbars() const { return m_requestType & AllowFrameScrollbars; }
</span><span class="cx"> bool allowsChildFrameContent() const { return m_requestType & AllowChildFrameContent; }
</span><span class="cx"> bool isChildFrameHitTest() const { return m_requestType & ChildFrameHitTest; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/HitTestResult.cpp (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/HitTestResult.cpp 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebCore/rendering/HitTestResult.cpp 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> return &node;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HitTestResult::setToNonShadowAncestor()
</del><ins>+void HitTestResult::setToNonUserAgentShadowAncestor()
</ins><span class="cx"> {
</span><span class="cx"> if (Node* node = innerNode()) {
</span><span class="cx"> node = moveOutOfUserAgentShadowTree(*node);
</span><span class="lines">@@ -668,7 +668,7 @@
</span><span class="cx"> if (!node)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (request.disallowsShadowContent())
</del><ins>+ if (request.disallowsUserAgentShadowContent())
</ins><span class="cx"> node = node->document().ancestorInThisScope(node);
</span><span class="cx">
</span><span class="cx"> mutableRectBasedTestResult().add(node);
</span><span class="lines">@@ -688,7 +688,7 @@
</span><span class="cx"> if (!node)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (request.disallowsShadowContent())
</del><ins>+ if (request.disallowsUserAgentShadowContent())
</ins><span class="cx"> node = node->document().ancestorInThisScope(node);
</span><span class="cx">
</span><span class="cx"> mutableRectBasedTestResult().add(node);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingHitTestResulth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/HitTestResult.h (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/HitTestResult.h 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebCore/rendering/HitTestResult.h 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> const LayoutPoint& localPoint() const { return m_localPoint; }
</span><span class="cx"> void setLocalPoint(const LayoutPoint& p) { m_localPoint = p; }
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void setToNonShadowAncestor();
</del><ins>+ void setToNonUserAgentShadowAncestor();
</ins><span class="cx">
</span><span class="cx"> const HitTestLocation& hitTestLocation() const { return m_hitTestLocation; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderEmbeddedObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -424,7 +424,7 @@
</span><span class="cx">
</span><span class="cx"> IntRect rootViewRect = view().frameView().convertToRootView(snappedIntRect(rect));
</span><span class="cx">
</span><del>- HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowShadowContent | HitTestRequest::AllowChildFrameContent);
</del><ins>+ HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowUserAgentShadowContent | HitTestRequest::AllowChildFrameContent);
</ins><span class="cx"> HitTestResult result;
</span><span class="cx"> HitTestLocation location;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -7049,7 +7049,7 @@
</span><span class="cx"> LayoutSize hitTestOffset = portionLocation - (fragment.layerBounds.location() + regionContentBox.location()) + region.fragmentContainer().scrolledContentOffset();
</span><span class="cx">
</span><span class="cx"> // Always ignore clipping, since the RenderFlowThread has nothing to do with the bounds of the FrameView.
</span><del>- HitTestRequest newRequest(request.type() | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowShadowContent);
</del><ins>+ HitTestRequest newRequest(request.type() | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx">
</span><span class="cx"> // Make a new temporary HitTestLocation in the new region.
</span><span class="cx"> HitTestLocation newHitTestLocation(hitTestLocation, hitTestOffset);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceClippercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> IntPoint hitPoint;
</span><span class="cx"> HitTestResult result(hitPoint);
</span><del>- if (renderer->nodeAtFloatPoint(HitTestRequest(HitTestRequest::SVGClipContent | HitTestRequest::DisallowShadowContent), result, point, HitTestForeground))
</del><ins>+ if (renderer->nodeAtFloatPoint(HitTestRequest(HitTestRequest::SVGClipContent | HitTestRequest::DisallowUserAgentShadowContent), result, point, HitTestForeground))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -1439,7 +1439,7 @@
</span><span class="cx"> if (ignoreClipping)
</span><span class="cx"> hitType |= HitTestRequest::IgnoreClipping;
</span><span class="cx"> if (!allowShadowContent)
</span><del>- hitType |= HitTestRequest::DisallowShadowContent;
</del><ins>+ hitType |= HitTestRequest::DisallowUserAgentShadowContent;
</ins><span class="cx"> if (allowChildFrameContent)
</span><span class="cx"> hitType |= HitTestRequest::AllowChildFrameContent;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-05-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Rename HitTestRequest DisallowShadowContent to DisallowUserAgentShadowContent
+ https://bugs.webkit.org/show_bug.cgi?id=157447
+
+ Reviewed by Ryosuke Niwa.
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame elementAtPoint:]):
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView elementAtPoint:allowShadowContent:]):
+
</ins><span class="cx"> 2016-05-06 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable IOS_TEXT_AUTOSIZING on Mac and make it testable
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -2360,7 +2360,7 @@
</span><span class="cx"> Frame* coreFrame = _private->coreFrame;
</span><span class="cx"> if (!coreFrame)
</span><span class="cx"> return nil;
</span><del>- return [[[WebElementDictionary alloc] initWithHitTestResult:coreFrame->eventHandler().hitTestResultAtPoint(IntPoint(point), HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowShadowContent)] autorelease];
</del><ins>+ return [[[WebElementDictionary alloc] initWithHitTestResult:coreFrame->eventHandler().hitTestResultAtPoint(IntPoint(point), HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowUserAgentShadowContent)] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSURL *)_unreachableURL
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -7530,7 +7530,7 @@
</span><span class="cx"> if (!coreFrame)
</span><span class="cx"> return nil;
</span><span class="cx"> HitTestRequest::HitTestRequestType hitType = HitTestRequest::ReadOnly | HitTestRequest::Active
</span><del>- | (allow ? 0 : HitTestRequest::DisallowShadowContent);
</del><ins>+ | (allow ? 0 : HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx"> return [[[WebElementDictionary alloc] initWithHitTestResult:coreFrame->eventHandler().hitTestResultAtPoint(IntPoint(point), hitType)] autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebKit/win/ChangeLog 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-05-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Rename HitTestRequest DisallowShadowContent to DisallowUserAgentShadowContent
+ https://bugs.webkit.org/show_bug.cgi?id=157447
+
+ Reviewed by Ryosuke Niwa.
+
+ * WebView.cpp:
+ (WebView::gestureNotify):
+
</ins><span class="cx"> 2016-05-04 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: ARIA 'region' role is now a landmark; HTML 'section' element should be a landmark only if named
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebKit/win/WebView.cpp 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -1739,7 +1739,7 @@
</span><span class="cx"> IntPoint logicalGestureBeginPoint(gestureBeginPoint);
</span><span class="cx"> logicalGestureBeginPoint.scale(inverseScaleFactor, inverseScaleFactor);
</span><span class="cx">
</span><del>- HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::DisallowShadowContent);
</del><ins>+ HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx"> for (Frame* childFrame = &m_page->mainFrame(); childFrame; childFrame = EventHandler::subframeForTargetNode(m_gestureTargetNode.get())) {
</span><span class="cx"> FrameView* frameView = childFrame->view();
</span><span class="cx"> if (!frameView)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-05-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Rename HitTestRequest DisallowShadowContent to DisallowUserAgentShadowContent
+ https://bugs.webkit.org/show_bug.cgi?id=157447
+
+ Reviewed by Ryosuke Niwa.
+
+ * WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp:
+ (WebKit::WebPage::findZoomableAreaForPoint):
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::hitTest):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::determinePrimarySnapshottedPlugIn):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::rangeForWebSelectionAtPosition):
+ (WebKit::WebPage::rangeForBlockAtPoint):
+ (WebKit::WebPage::getPositionInformation):
+
</ins><span class="cx"> 2016-05-06 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable IOS_TEXT_AUTOSIZING on Mac and make it testable
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsWebPageCoordinatedGraphicscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(area);
</span><span class="cx"> Frame* mainframe = m_mainFrame->coreFrame();
</span><del>- HitTestResult result = mainframe->eventHandler().hitTestResultAtPoint(mainframe->view()->windowToContents(point), HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowShadowContent);
</del><ins>+ HitTestResult result = mainframe->eventHandler().hitTestResultAtPoint(mainframe->view()->windowToContents(point), HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx">
</span><span class="cx"> Node* node = result.innerNode();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -600,7 +600,7 @@
</span><span class="cx"> if (!m_coreFrame)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- return InjectedBundleHitTestResult::create(m_coreFrame->eventHandler().hitTestResultAtPoint(point, HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowShadowContent));
</del><ins>+ return InjectedBundleHitTestResult::create(m_coreFrame->eventHandler().hitTestResultAtPoint(point, HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowUserAgentShadowContent));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebFrame::getDocumentBackgroundColor(double* red, double* green, double* blue, double* alpha)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -4988,7 +4988,7 @@
</span><span class="cx"> IntRect searchRect = IntRect(IntPoint(), corePage()->mainFrame().view()->contentsSize());
</span><span class="cx"> searchRect.intersect(IntRect(IntPoint(), IntSize(primarySnapshottedPlugInSearchLimit, primarySnapshottedPlugInSearchLimit)));
</span><span class="cx">
</span><del>- HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::AllowChildFrameContent | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowShadowContent);
</del><ins>+ HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::AllowChildFrameContent | HitTestRequest::IgnoreClipping | HitTestRequest::DisallowUserAgentShadowContent);
</ins><span class="cx">
</span><span class="cx"> HTMLPlugInImageElement* candidatePlugIn = nullptr;
</span><span class="cx"> unsigned candidatePlugInArea = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (200539 => 200540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-05-07 05:52:01 UTC (rev 200539)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-05-07 06:03:50 UTC (rev 200540)
</span><span class="lines">@@ -881,7 +881,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Range> WebPage::rangeForWebSelectionAtPosition(const IntPoint& point, const VisiblePosition& position, SelectionFlags& flags)
</span><span class="cx"> {
</span><del>- HitTestResult result = m_page->mainFrame().eventHandler().hitTestResultAtPoint((point), HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent | HitTestRequest::AllowChildFrameContent);
</del><ins>+ HitTestResult result = m_page->mainFrame().eventHandler().hitTestResultAtPoint((point), HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowUserAgentShadowContent | HitTestRequest::AllowChildFrameContent);
</ins><span class="cx">
</span><span class="cx"> Node* currentNode = result.innerNode();
</span><span class="cx"> RefPtr<Range> range;
</span><span class="lines">@@ -946,7 +946,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Range> WebPage::rangeForBlockAtPoint(const IntPoint& point)
</span><span class="cx"> {
</span><del>- HitTestResult result = m_page->mainFrame().eventHandler().hitTestResultAtPoint((point), HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent | HitTestRequest::IgnoreClipping);
</del><ins>+ HitTestResult result = m_page->mainFrame().eventHandler().hitTestResultAtPoint((point), HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowUserAgentShadowContent | HitTestRequest::IgnoreClipping);
</ins><span class="cx">
</span><span class="cx"> Node* currentNode = result.innerNode();
</span><span class="cx"> RefPtr<Range> range;
</span><span class="lines">@@ -2283,7 +2283,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!elementIsLinkOrImage) {
</span><del>- HitTestResult result = m_page->mainFrame().eventHandler().hitTestResultAtPoint((point), HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent | HitTestRequest::AllowChildFrameContent);
</del><ins>+ HitTestResult result = m_page->mainFrame().eventHandler().hitTestResultAtPoint((point), HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowUserAgentShadowContent | HitTestRequest::AllowChildFrameContent);
</ins><span class="cx"> hitNode = result.innerNode();
</span><span class="cx"> // Hit test could return HTMLHtmlElement that has no renderer, if the body is smaller than the document.
</span><span class="cx"> if (hitNode && hitNode->renderer()) {
</span></span></pre>
</div>
</div>
</body>
</html>