Diff
Modified: trunk/LayoutTests/ChangeLog (206794 => 206795)
--- trunk/LayoutTests/ChangeLog 2016-10-04 23:25:33 UTC (rev 206794)
+++ trunk/LayoutTests/ChangeLog 2016-10-04 23:42:18 UTC (rev 206795)
@@ -1,3 +1,15 @@
+2016-10-03 Ryosuke Niwa <[email protected]>
+
+ ShadowRoot interface should have elementFromPoint
+ https://bugs.webkit.org/show_bug.cgi?id=162882
+
+ Reviewed by Chris Dumez.
+
+ Add a W3C style testharness.js test for elementFromPoint on ShadowRoot.
+
+ * fast/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint-expected.txt: Added.
+ * fast/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html: Added.
+
2016-10-04 Myles C. Maxfield <[email protected]>
font-family: cursive should map to KaiTi in Chinese
Added: trunk/LayoutTests/fast/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint-expected.txt (0 => 206795)
--- trunk/LayoutTests/fast/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint-expected.txt 2016-10-04 23:42:18 UTC (rev 206795)
@@ -0,0 +1,35 @@
+
+PASS document.elementFromPoint must return the shadow host of the hit-tested text node when the host has display: inline
+PASS document.elementFromPoint must return the shadow host of the hit-tested text node when the host has display: block
+PASS document.elementFromPoint must return the shadow host of the hit-tested text node when the host has display: inline-block
+PASS document.elementFromPoint must return the shadow host of the hit-tested text node assigned to a slot when the host has display: inline
+PASS document.elementFromPoint must return the shadow host of the hit-tested text node assigned to a slot when the host has display: block
+PASS document.elementFromPoint must return the shadow host of the hit-tested text node assigned to a slot when the host has display: inline-block
+PASS document.elementFromPoint must return the element assigned to a slot when the shadow host of the slot has display: inline
+PASS document.elementFromPoint must return the element assigned to a slot when the shadow host of the slot has display: block
+PASS document.elementFromPoint must return the element assigned to a slot when the shadow host of the slot has display: inline-block
+PASS shadowRoot.elementFromPoint must return the element parent of the hit-tested text node under the point when the shadow host has display: inline
+PASS shadowRoot.elementFromPoint must return the element parent of the hit-tested text node under the point when the shadow host has display: block
+PASS shadowRoot.elementFromPoint must return the element parent of the hit-tested text node under the point when the shadow host has display: inline-block
+PASS shadowRoot.elementFromPoint must return the shadow host when the hit-tested text node is a direct child of the root and the host has display: inline
+PASS shadowRoot.elementFromPoint must return the shadow host when the hit-tested text node is a direct child of the root and the host has display: block
+PASS shadowRoot.elementFromPoint must return the shadow host when the hit-tested text node is a direct child of the root and the host has display: inline-block
+PASS shadowRoot.elementFromPoint must return the slot to which the hit-tested text node is assigned when its host has display: inline
+PASS shadowRoot.elementFromPoint must return the slot to which the hit-tested text node is assigned when its host has display: block
+PASS shadowRoot.elementFromPoint must return the slot to which the hit-tested text node is assigned when its host has display: inline-block
+PASS shadowRoot.elementFromPoint must return the element parent of the hit-tested text node assigned to a slot in the shadow tree when its host has display: inline
+PASS shadowRoot.elementFromPoint must return the element parent of the hit-tested text node assigned to a slot in the shadow tree when its host has display: block
+PASS shadowRoot.elementFromPoint must return the element parent of the hit-tested text node assigned to a slot in the shadow tree when its host has display: inline-block
+PASS shadowRoot.elementFromPoint must return a child element assigned to a slot when the hit-tested text node is assigned to the shadow tree of the child element and the outer shadow host has display: inline
+PASS shadowRoot.elementFromPoint must return a child element assigned to a slot when the hit-tested text node is assigned to the shadow tree of the child element and the outer shadow host has display: block
+PASS shadowRoot.elementFromPoint must return a child element assigned to a slot when the hit-tested text node is assigned to the shadow tree of the child element and the outer shadow host has display: inline-block
+PASS shadowRoot.elementFromPoint must return a child element assigned to a slot when the hit-tested text node is assigned to a slot in the shadow tree of the child element and the outer shadow host has display: inline
+PASS shadowRoot.elementFromPoint must return a child element assigned to a slot when the hit-tested text node is assigned to a slot in the shadow tree of the child element and the outer shadow host has display: block
+PASS shadowRoot.elementFromPoint must return a child element assigned to a slot when the hit-tested text node is assigned to a slot in the shadow tree of the child element and the outer shadow host has display: inline-block
+PASS shadowRoot.elementFromPoint must return a child element with its own shadow tree assigned to a slot when the hit-tested text node is its direct child and the outer shadow host has display: inline
+PASS shadowRoot.elementFromPoint must return a child element with its own shadow tree assigned to a slot when the hit-tested text node is its direct child and the outer shadow host has display: block
+PASS shadowRoot.elementFromPoint must return a child element with its own shadow tree assigned to a slot when the hit-tested text node is its direct child and the outer shadow host has display: inline-block
+PASS shadowRoot.elementFromPoint must return a child element with its own shadow tree assigned to a slot when the hit-tested text node is a child of another element and the outer shadow host has display: inline
+PASS shadowRoot.elementFromPoint must return a child element with its own shadow tree assigned to a slot when the hit-tested text node is a child of another element and the outer shadow host has display: block
+PASS shadowRoot.elementFromPoint must return a child element with its own shadow tree assigned to a slot when the hit-tested text node is a child of another element and the outer shadow host has display: inline-block
+
Added: trunk/LayoutTests/fast/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html (0 => 206795)
--- trunk/LayoutTests/fast/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html 2016-10-04 23:42:18 UTC (rev 206795)
@@ -0,0 +1,204 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Shadow DOM and CSSOM View: Document.prototype.elementFromPoint</title>
+<meta name="author" title="Ryosuke Niwa" href=""
+<meta name="assert" content="DocumentOrShadowRoot must have elementFromPoint and must return retarget the result against the context object.">
+<link rel="help" href=""
+<link rel="help" href=""
+<script src=""
+<script src=""
+</head>
+<body>
+<div id="container"></div>
+<style>
+
+container { position: relative; }
+test-element { display: block; width: 100px; height: 100px; }
+
+</style>
+<script>
+
+function pointInElement(node) {
+ let x = 5;
+ let y = 5;
+ do {
+ x += node.offsetLeft;
+ y += node.offsetTop;
+ node = node.offsetParent;
+ } while (node);
+ return [x, y];
+}
+
+const displayValues = ['inline', 'block', 'inline-block'];
+var container = document.getElementById('container');
+
+displayValues.forEach(function (displayValue) {
+ test(function () {
+ container.innerHTML = '';
+ let host = document.createElement('test-element');
+ host.style.display = displayValue;
+ let shadow = host.attachShadow({mode: 'closed'});
+ shadow.innerHTML = 'hello';
+ container.appendChild(host);
+ assert_equals(document.elementFromPoint(...pointInElement(host)), host);
+ }, 'document.elementFromPoint must return the shadow host of the hit-tested text node when the host has display: ' + displayValue);
+});
+
+displayValues.forEach(function (displayValue) {
+ test(function () {
+ container.innerHTML = '';
+ let host = document.createElement('test-element');
+ host.style.display = displayValue;
+ let shadow = host.attachShadow({mode: 'closed'});
+ shadow.innerHTML = '<slot></slot>';
+ host.innerHTML = 'text';
+ container.appendChild(host);
+ assert_equals(document.elementFromPoint(...pointInElement(host)), host);
+ }, 'document.elementFromPoint must return the shadow host of the hit-tested text node assigned to a slot when the host has display: ' + displayValue);
+});
+
+displayValues.forEach(function (displayValue) {
+ test(function () {
+ container.innerHTML = '';
+ let host = document.createElement('test-element');
+ host.style.display = displayValue;
+ let shadow = host.attachShadow({mode: 'closed'});
+ shadow.innerHTML = '<slot></slot>';
+ host.innerHTML = '<span>text</span>';
+ container.appendChild(host);
+ assert_equals(document.elementFromPoint(...pointInElement(host)), host.querySelector('span'));
+ }, 'document.elementFromPoint must return the element assigned to a slot when the shadow host of the slot has display: ' + displayValue);
+});
+
+displayValues.forEach(function (displayValue) {
+ test(function () {
+ container.innerHTML = '';
+ let host = document.createElement('test-element');
+ host.style.display = displayValue;
+ let shadow = host.attachShadow({mode: 'closed'});
+ shadow.innerHTML = '<span>text</span>';
+ container.appendChild(host);
+ assert_equals(shadow.elementFromPoint(...pointInElement(shadow.querySelector('span'))), shadow.querySelector('span'));
+ }, 'shadowRoot.elementFromPoint must return the element parent of the hit-tested text node under the point when the shadow host has display: ' + displayValue);
+});
+
+displayValues.forEach(function (displayValue) {
+ test(function () {
+ container.innerHTML = '';
+ let host = document.createElement('test-element');
+ host.style.display = displayValue;
+ let shadow = host.attachShadow({mode: 'closed'});
+ shadow.innerHTML = 'text';
+ container.appendChild(host);
+ assert_equals(shadow.elementFromPoint(...pointInElement(host)), host);
+ }, 'shadowRoot.elementFromPoint must return the shadow host when the hit-tested text node is a direct child of the root and the host has display: ' + displayValue);
+});
+
+displayValues.forEach(function (displayValue) {
+ test(function () {
+ container.innerHTML = '';
+ let host = document.createElement('test-element');
+ host.style.display = displayValue;
+ let shadow = host.attachShadow({mode: 'closed'});
+ shadow.innerHTML = '<slot></slot>';
+ host.innerHTML = 'hello';
+ container.appendChild(host);
+ assert_equals(shadow.elementFromPoint(...pointInElement(host)), shadow.querySelector('slot'));
+ }, 'shadowRoot.elementFromPoint must return the slot to which the hit-tested text node is assigned when its host has display: ' + displayValue);
+});
+
+displayValues.forEach(function (displayValue) {
+ test(function () {
+ container.innerHTML = '';
+ let host = document.createElement('test-element');
+ host.style.display = displayValue;
+ let shadow = host.attachShadow({mode: 'closed'});
+ shadow.innerHTML = '<slot></slot>';
+ host.innerHTML = '<span>hello</span>';
+ container.appendChild(host);
+ assert_equals(shadow.elementFromPoint(...pointInElement(host)), host.querySelector('span'));
+ }, 'shadowRoot.elementFromPoint must return the element parent of the hit-tested text node assigned to a slot in the shadow tree when its host has display: ' + displayValue);
+});
+
+displayValues.forEach(function (displayValue) {
+ test(function () {
+ container.innerHTML = '';
+ let host = document.createElement('test-element');
+ host.style.display = displayValue;
+ let shadow = host.attachShadow({mode: 'closed'});
+ shadow.innerHTML = '<slot></slot>';
+ host.innerHTML = '<inner-host>hello</inner-host>';
+ container.appendChild(host);
+
+ let innerHost = host.querySelector('inner-host');
+ let innerShadow = innerHost.attachShadow({mode: 'closed'});
+ innerShadow.innerHTML = '<slot></slot>';
+
+ assert_equals(shadow.elementFromPoint(...pointInElement(host)), innerHost);
+ }, 'shadowRoot.elementFromPoint must return a child element assigned to a slot'
+ + ' when the hit-tested text node is assigned to the shadow tree of the child element and the outer shadow host has display: ' + displayValue);
+});
+
+displayValues.forEach(function (displayValue) {
+ test(function () {
+ container.innerHTML = '';
+ let host = document.createElement('test-element');
+ host.style.display = displayValue;
+ let shadow = host.attachShadow({mode: 'closed'});
+ shadow.innerHTML = '<slot></slot>';
+ host.innerHTML = '<inner-host>hello</inner-host>';
+ container.appendChild(host);
+
+ let innerHost = host.querySelector('inner-host');
+ let innerShadow = innerHost.attachShadow({mode: 'closed'});
+ innerShadow.innerHTML = '<slot></slot>';
+
+ assert_equals(shadow.elementFromPoint(...pointInElement(host)), innerHost);
+ }, 'shadowRoot.elementFromPoint must return a child element assigned to a slot'
+ + ' when the hit-tested text node is assigned to a slot in the shadow tree of the child element and the outer shadow host has display: ' + displayValue);
+});
+
+displayValues.forEach(function (displayValue) {
+ test(function () {
+ container.innerHTML = '';
+ let host = document.createElement('test-element');
+ host.style.display = displayValue;
+ let shadow = host.attachShadow({mode: 'closed'});
+ shadow.innerHTML = '<slot></slot>';
+ host.innerHTML = '<inner-host></inner-host>';
+ container.appendChild(host);
+
+ let innerHost = host.querySelector('inner-host');
+ let innerShadow = innerHost.attachShadow({mode: 'closed'});
+ innerShadow.innerHTML = 'hello';
+
+ assert_equals(shadow.elementFromPoint(...pointInElement(host)), innerHost);
+ }, 'shadowRoot.elementFromPoint must return a child element with its own shadow tree assigned to a slot'
+ + ' when the hit-tested text node is its direct child and the outer shadow host has display: ' + displayValue);
+});
+
+displayValues.forEach(function (displayValue) {
+ test(function () {
+ container.innerHTML = '';
+ let host = document.createElement('test-element');
+ host.style.display = displayValue;
+ let shadow = host.attachShadow({mode: 'closed'});
+ shadow.innerHTML = '<slot></slot>';
+ host.innerHTML = '<inner-host></inner-host>';
+ container.appendChild(host);
+
+ let innerHost = host.querySelector('inner-host');
+ let innerShadow = innerHost.attachShadow({mode: 'closed'});
+ innerShadow.innerHTML = '<span>hello</span>';
+
+ assert_equals(shadow.elementFromPoint(...pointInElement(host)), innerHost);
+ }, 'shadowRoot.elementFromPoint must return a child element with its own shadow tree assigned to a slot'
+ + ' when the hit-tested text node is a child of another element and the outer shadow host has display: ' + displayValue);
+});
+
+container.innerHTML = '';
+
+</script>
+</body>
+</html>
Modified: trunk/Source/WebCore/CMakeLists.txt (206794 => 206795)
--- trunk/Source/WebCore/CMakeLists.txt 2016-10-04 23:25:33 UTC (rev 206794)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-10-04 23:42:18 UTC (rev 206795)
@@ -391,6 +391,7 @@
dom/DeviceOrientationEvent.idl
dom/Document.idl
dom/DocumentFragment.idl
+ dom/DocumentOrShadowRoot.idl
dom/DocumentType.idl
dom/Element.idl
dom/ErrorEvent.idl
Modified: trunk/Source/WebCore/ChangeLog (206794 => 206795)
--- trunk/Source/WebCore/ChangeLog 2016-10-04 23:25:33 UTC (rev 206794)
+++ trunk/Source/WebCore/ChangeLog 2016-10-04 23:42:18 UTC (rev 206795)
@@ -1,3 +1,46 @@
+2016-10-03 Ryosuke Niwa <[email protected]>
+
+ ShadowRoot interface should have elementFromPoint
+ https://bugs.webkit.org/show_bug.cgi?id=162882
+
+ Reviewed by Chris Dumez.
+
+ Add elementFromPoint to ShadowRoot's prototype as specified at:
+ https://www.w3.org/TR/shadow-dom/#extensions-to-the-documentorshadowroot-mixin
+ with changes proposed at https://github.com/w3c/csswg-drafts/issues/556
+
+ Added TreeScope::retargetToScope which implements
+
+ This patch also factors DocumentOrShadowRoot.idl out of Document and ShadowRoot interfaces to better match
+ the latest DOM specification: https://dom.spec.whatwg.org/#mixin-documentorshadowroot
+
+ Test: fast/shadow-dom/Document-prototype-elementFromPoint.html
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/Document.cpp:
+ (WebCore::Document::nodeFromPoint): Moved to TreeScope.
+ (WebCore::Document::elementFromPoint): Moved to TreeScope.
+ * dom/Document.h:
+ * dom/Document.idl: Moved elementFromPoint and activeElement to DocumentOrShadowRoot.idl.
+ * dom/DocumentOrShadowRoot.idl: Added.
+ * dom/EventPath.cpp:
+ (WebCore::RelatedNodeRetargeter::checkConsistency): Use newly added TreeScope::retargetToScope.
+ * dom/ShadowRoot.idl: Moved activeElement to DocumentOrShadowRoot.idl.
+ * dom/TreeScope.cpp:
+ (WebCore::TreeScope::retargetToScope): Added. Implements https://dom.spec.whatwg.org/#retarget efficiently.
+ Instead of checking whether A (node) is a shadow-including inclusive ancestor of B (this scope) at each
+ parent, find the lowest ancestor which contains both A and B, and return the self-inclusive ancestor of B
+ in that tree. To find the lowest common ancestor in O(n), traverse all ancestors of A and B separately and
+ do a top-down traversal. The last tree scope in which A's ancestor and B's ancestor match is the lowest
+ common ancestor.
+ (WebCore::TreeScope::nodeFromPoint): Moved from Document.
+ (WebCore::TreeScope::elementFromPoint): Moved from Document. Use retargetToScope and parentInComposedTree
+ instead of parentNode and ancestorInThisScope to match the semantics proposed in
+ https://github.com/w3c/csswg-drafts/issues/556
+ * dom/TreeScope.h:
+
2016-10-04 Myles C. Maxfield <[email protected]>
font-family: cursive should map to KaiTi in Chinese
Modified: trunk/Source/WebCore/DerivedSources.make (206794 => 206795)
--- trunk/Source/WebCore/DerivedSources.make 2016-10-04 23:25:33 UTC (rev 206794)
+++ trunk/Source/WebCore/DerivedSources.make 2016-10-04 23:42:18 UTC (rev 206795)
@@ -301,6 +301,7 @@
$(WebCore)/dom/DeviceOrientationEvent.idl \
$(WebCore)/dom/Document.idl \
$(WebCore)/dom/DocumentFragment.idl \
+ $(WebCore)/dom/DocumentOrShadowRoot.idl \
$(WebCore)/dom/DocumentType.idl \
$(WebCore)/dom/Element.idl \
$(WebCore)/dom/ErrorEvent.idl \
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (206794 => 206795)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-10-04 23:25:33 UTC (rev 206794)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-10-04 23:42:18 UTC (rev 206795)
@@ -10877,6 +10877,7 @@
9B03D8061BB3110D00B764D9 /* ReadableStreamInternalsBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamInternalsBuiltins.h; sourceTree = "<group>"; };
9B03D8061BB3110D00B764E8 /* WritableStreamBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WritableStreamBuiltins.h; sourceTree = "<group>"; };
9B03D8061BB3110D00B764E9 /* WritableStreamInternalsBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WritableStreamInternalsBuiltins.h; sourceTree = "<group>"; };
+ 9B0FE8731D9E02DF004A8ACB /* DocumentOrShadowRoot.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DocumentOrShadowRoot.idl; sourceTree = "<group>"; };
9B19B67E1B964E5200348745 /* ShadowRoot.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ShadowRoot.idl; sourceTree = "<group>"; };
9B1AB0791648C69D0051F3F2 /* HTMLFormControlsCollection.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = HTMLFormControlsCollection.idl; sourceTree = "<group>"; };
9B1AB07B1648C7C40051F3F2 /* JSHTMLFormControlsCollectionCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLFormControlsCollectionCustom.cpp; sourceTree = "<group>"; };
@@ -23014,6 +23015,7 @@
ED2BA83B09A24B91006C0AC4 /* DocumentMarker.h */,
CE057FA31220731100A476D5 /* DocumentMarkerController.cpp */,
CE057FA41220731100A476D5 /* DocumentMarkerController.h */,
+ 9B0FE8731D9E02DF004A8ACB /* DocumentOrShadowRoot.idl */,
14947FFB12F80CD200A0F631 /* DocumentOrderedMap.cpp */,
14947FFC12F80CD200A0F631 /* DocumentOrderedMap.h */,
A8C2280D11D4A59700D5A7D3 /* DocumentParser.cpp */,
Modified: trunk/Source/WebCore/dom/Document.cpp (206794 => 206795)
--- trunk/Source/WebCore/dom/Document.cpp 2016-10-04 23:25:33 UTC (rev 206794)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-10-04 23:42:18 UTC (rev 206795)
@@ -1425,52 +1425,6 @@
return ASCIILiteral("application/xml");
}
-Node* Document::nodeFromPoint(const LayoutPoint& clientPoint, LayoutPoint* localPoint)
-{
- if (!frame() || !view())
- return nullptr;
-
- Frame& frame = *this->frame();
-
- float scaleFactor = frame.pageZoomFactor() * frame.frameScaleFactor();
-
- LayoutPoint contentsPoint = clientPoint;
- contentsPoint.scale(scaleFactor, scaleFactor);
- contentsPoint.moveBy(view()->contentsScrollPosition());
-
- LayoutRect visibleRect;
-#if PLATFORM(IOS)
- visibleRect = view()->unobscuredContentRect();
-#else
- visibleRect = view()->visibleContentRect();
-#endif
- if (!visibleRect.contains(contentsPoint))
- return nullptr;
-
- HitTestResult result(contentsPoint);
- renderView()->hitTest(HitTestRequest(), result);
-
- if (localPoint)
- *localPoint = result.localPoint();
-
- return result.innerNode();
-}
-
-Element* Document::elementFromPoint(const LayoutPoint& clientPoint)
-{
- if (!hasLivingRenderTree())
- return nullptr;
-
- Node* node = nodeFromPoint(clientPoint);
- while (node && !is<Element>(*node))
- node = node->parentNode();
-
- if (node)
- node = ancestorInThisScope(node);
-
- return downcast<Element>(node);
-}
-
RefPtr<Range> Document::caretRangeFromPoint(int x, int y)
{
return caretRangeFromPoint(LayoutPoint(x, y));
Modified: trunk/Source/WebCore/dom/Document.h (206794 => 206795)
--- trunk/Source/WebCore/dom/Document.h 2016-10-04 23:25:33 UTC (rev 206794)
+++ trunk/Source/WebCore/dom/Document.h 2016-10-04 23:42:18 UTC (rev 206795)
@@ -397,9 +397,6 @@
NamedFlowCollection& namedFlows();
- Element* elementFromPoint(int x, int y) { return elementFromPoint(LayoutPoint(x, y)); }
- WEBCORE_EXPORT Element* elementFromPoint(const LayoutPoint& clientPoint);
-
WEBCORE_EXPORT RefPtr<Range> caretRangeFromPoint(int x, int y);
RefPtr<Range> caretRangeFromPoint(const LayoutPoint& clientPoint);
@@ -1363,8 +1360,6 @@
PageVisibilityState pageVisibilityState() const;
- Node* nodeFromPoint(const LayoutPoint& clientPoint, LayoutPoint* localPoint = nullptr);
-
template <CollectionType collectionType>
Ref<HTMLCollection> ensureCachedCollection();
Modified: trunk/Source/WebCore/dom/Document.idl (206794 => 206795)
--- trunk/Source/WebCore/dom/Document.idl 2016-10-04 23:25:33 UTC (rev 206794)
+++ trunk/Source/WebCore/dom/Document.idl 2016-10-04 23:42:18 UTC (rev 206795)
@@ -126,7 +126,6 @@
[ImplementedAs=characterSetWithUTF8Fallback] readonly attribute DOMString charset;
readonly attribute DOMString readyState;
- Element elementFromPoint(optional long x = 0, optional long y = 0);
Range caretRangeFromPoint(optional long x = 0, optional long y = 0);
// Mozilla extensions
@@ -141,7 +140,6 @@
HTMLCollection getElementsByClassName(DOMString classNames);
- readonly attribute Element? activeElement;
boolean hasFocus();
readonly attribute DOMString compatMode;
@@ -214,4 +212,5 @@
Document implements ParentNode;
Document implements NonElementParentNode;
+Document implements DocumentOrShadowRoot;
Document implements GlobalEventHandlers;
Added: trunk/Source/WebCore/dom/DocumentOrShadowRoot.idl (0 => 206795)
--- trunk/Source/WebCore/dom/DocumentOrShadowRoot.idl (rev 0)
+++ trunk/Source/WebCore/dom/DocumentOrShadowRoot.idl 2016-10-04 23:42:18 UTC (rev 206795)
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+// https://dom.spec.whatwg.org/#documentorshadowroot
+// https://www.w3.org/TR/shadow-dom/#extensions-to-the-documentorshadowroot-mixin
+[
+ NoInterfaceObject,
+] interface DocumentOrShadowRoot {
+ Element? elementFromPoint(optional long x = 0, optional long y = 0); // FIXME: x and y should be double and not be optional.
+ readonly attribute Element? activeElement;
+};
Modified: trunk/Source/WebCore/dom/EventPath.cpp (206794 => 206795)
--- trunk/Source/WebCore/dom/EventPath.cpp 2016-10-04 23:25:33 UTC (rev 206794)
+++ trunk/Source/WebCore/dom/EventPath.cpp 2016-10-04 23:42:18 UTC (rev 206795)
@@ -360,17 +360,10 @@
#if !ASSERT_DISABLED
void RelatedNodeRetargeter::checkConsistency(Node& currentTarget)
{
- ASSERT(!m_retargetedRelatedNode || currentTarget.isUnclosedNode(*m_retargetedRelatedNode));
-
- // http://w3c.github.io/webcomponents/spec/shadow/#dfn-retargeting-algorithm
- Node& base = currentTarget;
- for (Node* targetAncestor = &m_relatedNode; targetAncestor; targetAncestor = targetAncestor->parentOrShadowHostNode()) {
- if (targetAncestor->rootNode().containsIncludingShadowDOM(&base)) {
- ASSERT(m_retargetedRelatedNode == targetAncestor);
- return;
- }
- }
- ASSERT(!m_retargetedRelatedNode || m_hasDifferentTreeRoot);
+ if (!m_retargetedRelatedNode)
+ return;
+ ASSERT(currentTarget.isUnclosedNode(*m_retargetedRelatedNode));
+ ASSERT(m_retargetedRelatedNode == ¤tTarget.treeScope().retargetToScope(m_relatedNode));
}
#endif
Modified: trunk/Source/WebCore/dom/ShadowRoot.idl (206794 => 206795)
--- trunk/Source/WebCore/dom/ShadowRoot.idl 2016-10-04 23:25:33 UTC (rev 206794)
+++ trunk/Source/WebCore/dom/ShadowRoot.idl 2016-10-04 23:42:18 UTC (rev 206795)
@@ -28,7 +28,6 @@
JSGenerateToJSObject
] interface ShadowRoot : DocumentFragment {
readonly attribute ShadowRootMode mode;
- readonly attribute Element activeElement;
readonly attribute Element host;
[TreatNullAs=EmptyString, SetterMayThrowLegacyException] attribute DOMString innerHTML;
@@ -36,3 +35,5 @@
// "user-agent" is a WebKit extension that is not exposed to the Web.
enum ShadowRootMode { "user-agent", "closed", "open" };
+
+ShadowRoot implements DocumentOrShadowRoot;
Modified: trunk/Source/WebCore/dom/TreeScope.cpp (206794 => 206795)
--- trunk/Source/WebCore/dom/TreeScope.cpp 2016-10-04 23:25:33 UTC (rev 206794)
+++ trunk/Source/WebCore/dom/TreeScope.cpp 2016-10-04 23:42:18 UTC (rev 206795)
@@ -32,6 +32,7 @@
#include "ElementIterator.h"
#include "FocusController.h"
#include "Frame.h"
+#include "FrameView.h"
#include "HTMLAnchorElement.h"
#include "HTMLFrameOwnerElement.h"
#include "HTMLLabelElement.h"
@@ -39,6 +40,7 @@
#include "HitTestResult.h"
#include "IdTargetObserverRegistry.h"
#include "Page.h"
+#include "RenderView.h"
#include "RuntimeEnabledFeatures.h"
#include "ShadowRoot.h"
#include "TreeScopeAdopter.h"
@@ -168,6 +170,38 @@
m_elementsByName->remove(name, element);
}
+
+Node& TreeScope::retargetToScope(Node& node) const
+{
+ auto& scope = node.treeScope();
+ if (LIKELY(this == &scope || !node.isInShadowTree()))
+ return node;
+ ASSERT(is<ShadowRoot>(scope.rootNode()));
+
+ Vector<TreeScope*, 8> nodeTreeScopes;
+ for (auto* currentScope = &scope; currentScope; currentScope = currentScope->parentTreeScope())
+ nodeTreeScopes.append(currentScope);
+ ASSERT(nodeTreeScopes.size() >= 2);
+
+ Vector<const TreeScope*, 8> ancestorScopes;
+ for (auto* currentScope = this; currentScope; currentScope = currentScope->parentTreeScope())
+ ancestorScopes.append(currentScope);
+
+ size_t i = nodeTreeScopes.size();
+ size_t j = ancestorScopes.size();
+ while (i > 0 && j > 0 && nodeTreeScopes[i - 1] == ancestorScopes[j - 1]) {
+ --i;
+ --j;
+ }
+
+ bool nodeIsInOuterTreeScope = !i;
+ if (nodeIsInOuterTreeScope)
+ return node;
+
+ ShadowRoot& shadowRootInLowestCommonTreeScope = downcast<ShadowRoot>(nodeTreeScopes[i - 1]->rootNode());
+ return *shadowRootInLowestCommonTreeScope.host();
+}
+
Node* TreeScope::ancestorInThisScope(Node* node) const
{
for (; node; node = node->shadowHost()) {
@@ -245,6 +279,58 @@
return m_labelsByForAttribute->getElementByLabelForAttribute(*forAttributeValue.impl(), *this);
}
+Node* TreeScope::nodeFromPoint(const LayoutPoint& clientPoint, LayoutPoint* localPoint)
+{
+ auto* frame = documentScope().frame();
+ auto* view = documentScope().view();
+ if (!frame || !view)
+ return nullptr;
+
+ float scaleFactor = frame->pageZoomFactor() * frame->frameScaleFactor();
+
+ LayoutPoint contentsPoint = clientPoint;
+ contentsPoint.scale(scaleFactor, scaleFactor);
+ contentsPoint.moveBy(view->contentsScrollPosition());
+
+ LayoutRect visibleRect;
+#if PLATFORM(IOS)
+ visibleRect = view->unobscuredContentRect();
+#else
+ visibleRect = view->visibleContentRect();
+#endif
+ if (!visibleRect.contains(contentsPoint))
+ return nullptr;
+
+ HitTestResult result(contentsPoint);
+ documentScope().renderView()->hitTest(HitTestRequest(), result);
+
+ if (localPoint)
+ *localPoint = result.localPoint();
+
+ return result.innerNode();
+}
+
+Element* TreeScope::elementFromPoint(int x, int y)
+{
+ Document& document = documentScope();
+ if (!document.hasLivingRenderTree())
+ return nullptr;
+
+ Node* node = nodeFromPoint(LayoutPoint(x, y), nullptr);
+ if (!node)
+ return nullptr;
+
+ node = &retargetToScope(*node);
+ while (!is<Element>(*node)) {
+ node = node->parentInComposedTree();
+ if (!node)
+ break;
+ node = &retargetToScope(*node);
+ }
+
+ return downcast<Element>(node);
+}
+
DOMSelection* TreeScope::getSelection() const
{
if (!m_rootNode.document().frame())
Modified: trunk/Source/WebCore/dom/TreeScope.h (206794 => 206795)
--- trunk/Source/WebCore/dom/TreeScope.h 2016-10-04 23:25:33 UTC (rev 206794)
+++ trunk/Source/WebCore/dom/TreeScope.h 2016-10-04 23:42:18 UTC (rev 206795)
@@ -71,6 +71,9 @@
Document& documentScope() const { return *m_documentScope; }
static ptrdiff_t documentScopeMemoryOffset() { return OBJECT_OFFSETOF(TreeScope, m_documentScope); }
+ // https://dom.spec.whatwg.org/#retarget
+ Node& retargetToScope(Node&) const;
+
Node* ancestorInThisScope(Node*) const;
void addImageMap(HTMLMapElement&);
@@ -83,6 +86,8 @@
void removeLabel(const AtomicStringImpl& forAttributeValue, HTMLLabelElement&);
HTMLLabelElement* labelElementForId(const AtomicString& forAttributeValue);
+ WEBCORE_EXPORT Element* elementFromPoint(int x, int y);
+
DOMSelection* getSelection() const;
// Find first anchor with the given name.
@@ -111,6 +116,8 @@
m_documentScope = document;
}
+ Node* nodeFromPoint(const LayoutPoint& clientPoint, LayoutPoint* localPoint);
+
private:
ContainerNode& m_rootNode;
Document* m_documentScope;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (206794 => 206795)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-04 23:25:33 UTC (rev 206794)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-04 23:42:18 UTC (rev 206795)
@@ -3213,7 +3213,7 @@
#endif
#if ENABLE(CUSTOM_ELEMENTS)
- RuntimeEnabledFeatures::sharedFeatures().setCustomElementsEnabled(store.getBoolValueForKey(WebPreferencesKey::customElementsEnabledKey()));
+ RuntimeEnabledFeatures::sharedFeatures().setCustomElementsEnabled(true || store.getBoolValueForKey(WebPreferencesKey::customElementsEnabledKey()));
#endif
#if ENABLE(WEBGL2)
