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