<!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>[211139] trunk</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/211139">211139</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-25 01:11:52 -0800 (Wed, 25 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>collectMatchingElementsInFlatTree should not find elements inside an user agent shadow tree
https://bugs.webkit.org/show_bug.cgi?id=167409
Reviewed by Antti Koivisto.
Source/JavaScriptCore:
Added matchingElementInFlatTree as a common identifier since it's required in the bindings code.
* runtime/CommonIdentifiers.h:
Source/WebCore:
The bug was caused by collectMatchingElementsInFlatTree including elements inside an user agent shadow tree
even though it shouldn't. Fixed the bug by checking that condition.
Also added matchingElementInFlatTree to find the first element matching a selector as opposed to all,
again, only exposed in a world which forces all shadow trees to be accessible.
* page/DOMWindow.cpp:
(WebCore::selectorQueryInFrame):
(WebCore::DOMWindow::collectMatchingElementsInFlatTree):
(WebCore::DOMWindow::matchingElementInFlatTree):
* page/DOMWindow.h:
* page/DOMWindow.idl:
Tools:
Added a test case for collectMatchingElementsInFlatTree not finding elements inside an user agent shadow tree
as well as tests for the newly added matchingElementInFlatTree.
* TestWebKitAPI/Tests/WebKit2/InjectedBundleMakeAllShadowRootsOpen.cpp:
(TestWebKitAPI::runJavaScriptAlert):
* TestWebKitAPI/Tests/WebKit2/InjectedBundleMakeAllShadowRootsOpen_Bundle.cpp:
(TestWebKitAPI::InjectedBundleMakeAllShadowRootOpenTest::initialize):
* TestWebKitAPI/Tests/WebKit2/closed-shadow-tree-test.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonIdentifiersh">trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowh">trunk/Source/WebCore/page/DOMWindow.h</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowidl">trunk/Source/WebCore/page/DOMWindow.idl</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2InjectedBundleMakeAllShadowRootsOpencpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleMakeAllShadowRootsOpen.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2InjectedBundleMakeAllShadowRootsOpen_Bundlecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleMakeAllShadowRootsOpen_Bundle.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2closedshadowtreetesthtml">trunk/Tools/TestWebKitAPI/Tests/WebKit2/closed-shadow-tree-test.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (211138 => 211139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-01-25 08:01:08 UTC (rev 211138)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-01-25 09:11:52 UTC (rev 211139)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-01-25 Ryosuke Niwa <rniwa@webkit.org>
+
+ collectMatchingElementsInFlatTree should not find elements inside an user agent shadow tree
+ https://bugs.webkit.org/show_bug.cgi?id=167409
+
+ Reviewed by Antti Koivisto.
+
+ Added matchingElementInFlatTree as a common identifier since it's required in the bindings code.
+
+ * runtime/CommonIdentifiers.h:
+
</ins><span class="cx"> 2017-01-24 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Fold USER_TIMING into WEB_TIMING and make it a RuntimeEnabledFeature
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonIdentifiersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h (211138 => 211139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h 2017-01-25 08:01:08 UTC (rev 211138)
+++ trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h 2017-01-25 09:11:52 UTC (rev 211139)
</span><span class="lines">@@ -280,6 +280,7 @@
</span><span class="cx"> macro(valueOf) \
</span><span class="cx"> macro(webkit) \
</span><span class="cx"> macro(collectMatchingElementsInFlatTree) \
</span><ins>+ macro(matchingElementInFlatTree) \
</ins><span class="cx"> macro(webkitIDBCursor) \
</span><span class="cx"> macro(webkitIDBDatabase) \
</span><span class="cx"> macro(webkitIDBFactory) \
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211138 => 211139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-25 08:01:08 UTC (rev 211138)
+++ trunk/Source/WebCore/ChangeLog 2017-01-25 09:11:52 UTC (rev 211139)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-01-25 Ryosuke Niwa <rniwa@webkit.org>
+
+ collectMatchingElementsInFlatTree should not find elements inside an user agent shadow tree
+ https://bugs.webkit.org/show_bug.cgi?id=167409
+
+ Reviewed by Antti Koivisto.
+
+ The bug was caused by collectMatchingElementsInFlatTree including elements inside an user agent shadow tree
+ even though it shouldn't. Fixed the bug by checking that condition.
+
+ Also added matchingElementInFlatTree to find the first element matching a selector as opposed to all,
+ again, only exposed in a world which forces all shadow trees to be accessible.
+
+ * page/DOMWindow.cpp:
+ (WebCore::selectorQueryInFrame):
+ (WebCore::DOMWindow::collectMatchingElementsInFlatTree):
+ (WebCore::DOMWindow::matchingElementInFlatTree):
+ * page/DOMWindow.h:
+ * page/DOMWindow.idl:
+
</ins><span class="cx"> 2017-01-24 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r208902): URLWithUserTypedString returns nil with file URLs
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (211138 => 211139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2017-01-25 08:01:08 UTC (rev 211138)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2017-01-25 09:11:52 UTC (rev 211139)
</span><span class="lines">@@ -623,16 +623,21 @@
</span><span class="cx"> return *m_customElementRegistry;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<Ref<NodeList>> DOMWindow::collectMatchingElementsInFlatTree(Node& scope, const String& selectors)
</del><ins>+static ExceptionOr<SelectorQuery&> selectorQueryInFrame(Frame* frame, const String& selectors)
</ins><span class="cx"> {
</span><del>- if (!m_frame)
</del><ins>+ if (!frame)
</ins><span class="cx"> return Exception { NOT_SUPPORTED_ERR };
</span><span class="cx">
</span><del>- Document* document = m_frame->document();
</del><ins>+ Document* document = frame->document();
</ins><span class="cx"> if (!document)
</span><span class="cx"> return Exception { NOT_SUPPORTED_ERR };
</span><span class="cx">
</span><del>- auto queryOrException = document->selectorQueryForString(selectors);
</del><ins>+ return document->selectorQueryForString(selectors);
+}
+
+ExceptionOr<Ref<NodeList>> DOMWindow::collectMatchingElementsInFlatTree(Node& scope, const String& selectors)
+{
+ auto queryOrException = selectorQueryInFrame(m_frame, selectors);
</ins><span class="cx"> if (queryOrException.hasException())
</span><span class="cx"> return queryOrException.releaseException();
</span><span class="cx">
</span><span class="lines">@@ -643,7 +648,7 @@
</span><span class="cx">
</span><span class="cx"> Vector<Ref<Element>> result;
</span><span class="cx"> for (auto& node : composedTreeDescendants(downcast<ContainerNode>(scope))) {
</span><del>- if (is<Element>(node) && query.matches(downcast<Element>(node)))
</del><ins>+ if (is<Element>(node) && query.matches(downcast<Element>(node)) && !node.isInUserAgentShadowTree())
</ins><span class="cx"> result.append(downcast<Element>(node));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -650,6 +655,25 @@
</span><span class="cx"> return Ref<NodeList> { StaticElementList::create(WTFMove(result)) };
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ExceptionOr<RefPtr<Element>> DOMWindow::matchingElementInFlatTree(Node& scope, const String& selectors)
+{
+ auto queryOrException = selectorQueryInFrame(m_frame, selectors);
+ if (queryOrException.hasException())
+ return queryOrException.releaseException();
+
+ if (!is<ContainerNode>(scope))
+ return RefPtr<Element> { nullptr };
+
+ SelectorQuery& query = queryOrException.releaseReturnValue();
+
+ for (auto& node : composedTreeDescendants(downcast<ContainerNode>(scope))) {
+ if (is<Element>(node) && query.matches(downcast<Element>(node)) && !node.isInUserAgentShadowTree())
+ return &downcast<Element>(node);
+ }
+
+ return RefPtr<Element> { nullptr };
+}
+
</ins><span class="cx"> #if ENABLE(ORIENTATION_EVENTS)
</span><span class="cx">
</span><span class="cx"> int DOMWindow::orientation() const
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.h (211138 => 211139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.h 2017-01-25 08:01:08 UTC (rev 211138)
+++ trunk/Source/WebCore/page/DOMWindow.h 2017-01-25 09:11:52 UTC (rev 211139)
</span><span class="lines">@@ -278,6 +278,7 @@
</span><span class="cx"> CustomElementRegistry& ensureCustomElementRegistry();
</span><span class="cx">
</span><span class="cx"> ExceptionOr<Ref<NodeList>> collectMatchingElementsInFlatTree(Node&, const String& selectors);
</span><ins>+ ExceptionOr<RefPtr<Element>> matchingElementInFlatTree(Node&, const String& selectors);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(ORIENTATION_EVENTS)
</span><span class="cx"> // This is the interface orientation in degrees. Some examples are:
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.idl (211138 => 211139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.idl 2017-01-25 08:01:08 UTC (rev 211138)
+++ trunk/Source/WebCore/page/DOMWindow.idl 2017-01-25 09:11:52 UTC (rev 211139)
</span><span class="lines">@@ -177,6 +177,8 @@
</span><span class="cx">
</span><span class="cx"> [MayThrowException, EnabledForWorld=shadowRootIsAlwaysOpen]
</span><span class="cx"> NodeList collectMatchingElementsInFlatTree(Node scope, DOMString selectors);
</span><ins>+ [MayThrowException, EnabledForWorld=shadowRootIsAlwaysOpen]
+ Element? matchingElementInFlatTree(Node scope, DOMString selectors);
</ins><span class="cx">
</span><span class="cx"> // Event handlers unique to Element and DOMWindow.
</span><span class="cx"> // FIXME: Should these be exposed on Document as well (and therefore moved to GlobalEventHandlers.idl)?
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (211138 => 211139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-01-25 08:01:08 UTC (rev 211138)
+++ trunk/Tools/ChangeLog 2017-01-25 09:11:52 UTC (rev 211139)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-01-25 Ryosuke Niwa <rniwa@webkit.org>
+
+ collectMatchingElementsInFlatTree should not find elements inside an user agent shadow tree
+ https://bugs.webkit.org/show_bug.cgi?id=167409
+
+ Reviewed by Antti Koivisto.
+
+ Added a test case for collectMatchingElementsInFlatTree not finding elements inside an user agent shadow tree
+ as well as tests for the newly added matchingElementInFlatTree.
+
+ * TestWebKitAPI/Tests/WebKit2/InjectedBundleMakeAllShadowRootsOpen.cpp:
+ (TestWebKitAPI::runJavaScriptAlert):
+ * TestWebKitAPI/Tests/WebKit2/InjectedBundleMakeAllShadowRootsOpen_Bundle.cpp:
+ (TestWebKitAPI::InjectedBundleMakeAllShadowRootOpenTest::initialize):
+ * TestWebKitAPI/Tests/WebKit2/closed-shadow-tree-test.html:
+
</ins><span class="cx"> 2017-01-24 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add API to create ephemeral web views and deprecate the private browsing setting
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2InjectedBundleMakeAllShadowRootsOpencpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleMakeAllShadowRootsOpen.cpp (211138 => 211139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleMakeAllShadowRootsOpen.cpp 2017-01-25 08:01:08 UTC (rev 211138)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleMakeAllShadowRootsOpen.cpp 2017-01-25 09:11:52 UTC (rev 211139)
</span><span class="lines">@@ -50,10 +50,10 @@
</span><span class="cx"> EXPECT_WK_STREQ("PASS: shadowRoot created by normal world", alertText);
</span><span class="cx"> break;
</span><span class="cx"> case 3:
</span><del>- EXPECT_WK_STREQ("PASS: query method exists", alertText);
</del><ins>+ EXPECT_WK_STREQ("PASS: collectMatchingElementsInFlatTree exists", alertText);
</ins><span class="cx"> break;
</span><span class="cx"> case 4:
</span><del>- EXPECT_WK_STREQ("PASS: query method was not present in the normal world", alertText);
</del><ins>+ EXPECT_WK_STREQ("PASS: collectMatchingElementsInFlatTree was not present in the normal world", alertText);
</ins><span class="cx"> break;
</span><span class="cx"> case 5:
</span><span class="cx"> EXPECT_WK_STREQ("Found:1,2,3,4,5,6", alertText);
</span><span class="lines">@@ -60,6 +60,24 @@
</span><span class="cx"> break;
</span><span class="cx"> case 6:
</span><span class="cx"> EXPECT_WK_STREQ("Found:2,3,4", alertText);
</span><ins>+ break;
+ case 7:
+ EXPECT_WK_STREQ("PASS: matchingElementInFlatTree exists", alertText);
+ break;
+ case 8:
+ EXPECT_WK_STREQ("PASS: matchingElementInFlatTree was not present in the normal world", alertText);
+ break;
+ case 9:
+ EXPECT_WK_STREQ("Found:1", alertText);
+ break;
+ case 10:
+ EXPECT_WK_STREQ("Found:2", alertText);
+ break;
+ case 11:
+ EXPECT_WK_STREQ("Found:0 divs", alertText);
+ break;
+ case 12:
+ EXPECT_WK_STREQ("Found:false", alertText);
</ins><span class="cx"> done = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2InjectedBundleMakeAllShadowRootsOpen_Bundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleMakeAllShadowRootsOpen_Bundle.cpp (211138 => 211139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleMakeAllShadowRootsOpen_Bundle.cpp 2017-01-25 08:01:08 UTC (rev 211138)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/InjectedBundleMakeAllShadowRootsOpen_Bundle.cpp 2017-01-25 09:11:52 UTC (rev 211139)
</span><span class="lines">@@ -60,9 +60,9 @@
</span><span class="cx"> // Test 2
</span><span class="cx"> " alert(document.querySelector('shadow-host').shadowRoot ? 'PASS: shadowRoot created by normal world' : 'FAIL');\n"
</span><span class="cx"> // Test 3
</span><del>- " alert(window[queryMethodName] ? 'PASS: query method exists' : 'FAIL');\n"
</del><ins>+ " alert(window[queryMethodName] ? `PASS: ${queryMethodName} exists` : `FAIL: ${queryMethodName} does not exist`);\n"
</ins><span class="cx"> // Test 4
</span><del>- " document.dispatchEvent(new Event('testnormalworld'));\n"
</del><ins>+ " document.dispatchEvent(new CustomEvent('testnormalworld', {detail: queryMethodName}));\n"
</ins><span class="cx"> // Test 5
</span><span class="cx"> " const queryMethod = window[queryMethodName];\n"
</span><span class="cx"> " let queryResult = Array.from(queryMethod(document, 'span'));\n"
</span><span class="lines">@@ -71,6 +71,21 @@
</span><span class="cx"> " const innerHost = queryMethod(document, 'inner-host')[0];\n"
</span><span class="cx"> " queryResult = Array.from(queryMethod(innerHost, 'span'));\n"
</span><span class="cx"> " alert('Found:' + queryResult.map((span) => span.textContent).join(','));\n"
</span><ins>+ // Test 7
+ " alert(window.matchingElementInFlatTree ? `PASS: matchingElementInFlatTree exists` : `FAIL: matchingElementInFlatTree does not exist`);\n"
+ // Test 8
+ " document.dispatchEvent(new CustomEvent('testnormalworld', {detail: 'matchingElementInFlatTree'}));\n"
+ // Test 9
+ " queryResult = window.matchingElementInFlatTree(document, 'span');\n"
+ " alert('Found:' + (queryResult ? queryResult.textContent : 'null'));\n"
+ // Test 10
+ " queryResult = window.matchingElementInFlatTree(innerHost, 'span');\n"
+ " alert('Found:' + (queryResult ? queryResult.textContent : 'null'));\n"
+ // Test 11
+ " alert(`Found:${queryMethod(document, 'div').length} divs`);\n"
+ // Test 12
+ " queryResult = window.matchingElementInFlatTree(document, 'div');\n"
+ " alert(`Found:${!!queryResult}`);\n"
</ins><span class="cx"> "}\n"));
</span><span class="cx"> WKBundleAddUserScript(bundle, pageGroup, world, source.get(), 0, 0, 0, kWKInjectAtDocumentStart, kWKInjectInAllFrames);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2closedshadowtreetesthtml"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/closed-shadow-tree-test.html (211138 => 211139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/closed-shadow-tree-test.html 2017-01-25 08:01:08 UTC (rev 211138)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/closed-shadow-tree-test.html 2017-01-25 09:11:52 UTC (rev 211139)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> <html>
</span><span class="cx"> <body>
</span><span class="cx"> <shadow-host><span>5</span><span slot="bar">2</span></shadow-host>
</span><ins>+<input type="text">
</ins><span class="cx"> <script>
</span><span class="cx"> const shadowRoot = document.querySelector('shadow-host').attachShadow({mode: 'closed'});
</span><span class="cx"> shadowRoot.innerHTML = `
</span><span class="lines">@@ -18,9 +19,8 @@
</span><span class="cx"> <slot name="foo"></slot>
</span><span class="cx"> <span>4</span>`;
</span><span class="cx">
</span><del>-document.addEventListener('testnormalworld', function () {
- alert(window.collectMatchingElementsInFlatTree ?
- 'FAIL' : 'PASS: query method was not present in the normal world');
</del><ins>+document.addEventListener('testnormalworld', function (event) {
+ alert(window[event.detail] ? `FAIL: ${event.detail} was present in the normal world` : `PASS: ${event.detail} was not present in the normal world`);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> </script>
</span></span></pre>
</div>
</div>
</body>
</html>