Changeset 145448 in webkit

Timestamp:

Mar 11, 2013, 6:08:34 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Hit testing should use ancestorInThisScope to get the non-shadow ancestor
​https://bugs.webkit.org/show_bug.cgi?id=112068

Patch by Christian Biesinger <​cbiesinger@chromium.org> on 2013-03-11
Reviewed by Dimitri Glazkov.

Source/WebCore:

Tests: media/nodesFromRect-shadowContent.html

• rendering/HitTestResult.cpp:

(WebCore::HitTestResult::setToNonShadowAncestor):
(WebCore::HitTestResult::addNodeToRectBasedTestResult):
Use ancestorInThisScope which is not deprecated and which produces
correct results for nested shadow trees (e.g. in case of <video>,
which contains <input> elements for the controls, which themselves
have shadow trees)

LayoutTests:

• media/nodesFromRect-shadowContent.html: Extend the hit testing rect

to guarantee reaching a nested shadow tree.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/nodesFromRect-shadowContent.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/HitTestResult.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-11  Christian Biesinger  <cbiesinger@chromium.org>
+
+        Hit testing should use ancestorInThisScope to get the non-shadow ancestor
+        https://bugs.webkit.org/show_bug.cgi?id=112068
+
+        Reviewed by Dimitri Glazkov.
+
+        * media/nodesFromRect-shadowContent.html: Extend the hit testing rect
+        to guarantee reaching a nested shadow tree.
+
 2013-03-11  James Robinson  <jamesr@chromium.org>
 

trunk/LayoutTests/media/nodesFromRect-shadowContent.html

@@ -34 +34 @@
       var clickY = playCoords[1];
 
-      check(clickX, clickY, 10, 10, 20, 20, [e.v1, e.body]);
+      check(clickX, clickY, 100, 100, 20, 20, [e.v1, e.body]);
 
       var shadow =['-webkit-media-controls-timeline-container', '-webkit-media-controls-play-button', '-webkit-media-controls-panel', '-webkit-media-controls'];

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-11  Christian Biesinger  <cbiesinger@chromium.org>
+
+        Hit testing should use ancestorInThisScope to get the non-shadow ancestor
+        https://bugs.webkit.org/show_bug.cgi?id=112068
+
+        Reviewed by Dimitri Glazkov.
+
+        Tests: media/nodesFromRect-shadowContent.html
+
+        * rendering/HitTestResult.cpp:
+        (WebCore::HitTestResult::setToNonShadowAncestor):
+        (WebCore::HitTestResult::addNodeToRectBasedTestResult):
+        Use ancestorInThisScope which is not deprecated and which produces
+        correct results for nested shadow trees (e.g. in case of <video>,
+        which contains <input> elements for the controls, which themselves
+        have shadow trees)
+
 2013-03-11  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/rendering/HitTestResult.cpp

@@ -116 +116 @@
     Node* node = innerNode();
     if (node)
-        node = node->deprecatedShadowAncestorNode();
+        node = node->document()->ancestorInThisScope(node);
     setInnerNode(node);
     node = innerNonSharedNode();
     if (node)
-        node = node->deprecatedShadowAncestorNode();
+        node = node->document()->ancestorInThisScope(node);
     setInnerNonSharedNode(node);
 }
@@ -558 +558 @@
 
     if (!request.allowsShadowContent())
-        node = node->deprecatedShadowAncestorNode();
+        node = node->document()->ancestorInThisScope(node);
 
     mutableRectBasedTestResult().add(node);
@@ -578 +578 @@
 
     if (!request.allowsShadowContent())
-        node = node->deprecatedShadowAncestorNode();
+        node = node->document()->ancestorInThisScope(node);
 
     mutableRectBasedTestResult().add(node);