Title: [136834] trunk
Revision
136834
Author
[email protected]
Date
2012-12-06 05:38:47 -0800 (Thu, 06 Dec 2012)

Log Message

Internals.getElementByIdInShadowRoot is nonsense now.
https://bugs.webkit.org/show_bug.cgi?id=104241

Reviewed by Kent Tamura.

.:

* Source/autotools/symbols.filter:

Source/WebCore:

Since we have ShadowRoot.getElementById() now, we don't need Internals.getElementByIdInShadowRoot, which is
the same functionality of ShadowRoot.getElementById().

Test: fast/dom/shadow/get-element-by-id-in-shadow-root.html

* WebCore.exp.in:
* testing/Internals.cpp:
* testing/Internals.h:
(Internals):
* testing/Internals.idl:

Source/WebKit2:

* win/WebKit2.def.in:

LayoutTests:

* fast/dom/shadow/get-element-by-id-in-shadow-root-expected.txt:
* fast/dom/shadow/get-element-by-id-in-shadow-root.html:
* fast/dom/shadow/resources/shadow-dom.js: Uses ShadowRoot.getElementById() instead.
(getNodeInShadowTreeStack):

Modified Paths

Diff

Modified: trunk/ChangeLog (136833 => 136834)


--- trunk/ChangeLog	2012-12-06 13:11:24 UTC (rev 136833)
+++ trunk/ChangeLog	2012-12-06 13:38:47 UTC (rev 136834)
@@ -1,3 +1,12 @@
+2012-12-06  Shinya Kawanaka  <[email protected]>
+
+        Internals.getElementByIdInShadowRoot is nonsense now.
+        https://bugs.webkit.org/show_bug.cgi?id=104241
+
+        Reviewed by Kent Tamura.
+
+        * Source/autotools/symbols.filter:
+
 2012-12-05  Halton Huo  <[email protected]>
 
         [CMake] Unify coding style for CMake files

Modified: trunk/LayoutTests/ChangeLog (136833 => 136834)


--- trunk/LayoutTests/ChangeLog	2012-12-06 13:11:24 UTC (rev 136833)
+++ trunk/LayoutTests/ChangeLog	2012-12-06 13:38:47 UTC (rev 136834)
@@ -1,3 +1,15 @@
+2012-12-06  Shinya Kawanaka  <[email protected]>
+
+        Internals.getElementByIdInShadowRoot is nonsense now.
+        https://bugs.webkit.org/show_bug.cgi?id=104241
+
+        Reviewed by Kent Tamura.
+
+        * fast/dom/shadow/get-element-by-id-in-shadow-root-expected.txt:
+        * fast/dom/shadow/get-element-by-id-in-shadow-root.html:
+        * fast/dom/shadow/resources/shadow-dom.js: Uses ShadowRoot.getElementById() instead.
+        (getNodeInShadowTreeStack):
+
 2012-12-06  Sheriff Bot  <[email protected]>
 
         Unreviewed, rolling out r136818.

Modified: trunk/LayoutTests/fast/dom/shadow/get-element-by-id-in-shadow-root-expected.txt (136833 => 136834)


--- trunk/LayoutTests/fast/dom/shadow/get-element-by-id-in-shadow-root-expected.txt	2012-12-06 13:11:24 UTC (rev 136833)
+++ trunk/LayoutTests/fast/dom/shadow/get-element-by-id-in-shadow-root-expected.txt	2012-12-06 13:38:47 UTC (rev 136834)
@@ -1,4 +1,4 @@
-Tests to ensure that internals.getElementByIdInShadowRoot can get an element in ShadowRoot by its id. Can only run within DRT
+Tests to ensure that ShadowRoot.getElementById can get an element in ShadowRoot by its id. Can only run within DRT
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 

Modified: trunk/LayoutTests/fast/dom/shadow/get-element-by-id-in-shadow-root.html (136833 => 136834)


--- trunk/LayoutTests/fast/dom/shadow/get-element-by-id-in-shadow-root.html	2012-12-06 13:11:24 UTC (rev 136833)
+++ trunk/LayoutTests/fast/dom/shadow/get-element-by-id-in-shadow-root.html	2012-12-06 13:38:47 UTC (rev 136834)
@@ -6,7 +6,7 @@
 </head>
 <body>
 <script>
-description("Tests to ensure that internals.getElementByIdInShadowRoot can get an element in ShadowRoot by its id. Can only run within DRT");
+description("Tests to ensure that ShadowRoot.getElementById can get an element in ShadowRoot by its id. Can only run within DRT");
 
 function prepareDomTree(parent)
 {

Modified: trunk/LayoutTests/fast/dom/shadow/resources/shadow-dom.js (136833 => 136834)


--- trunk/LayoutTests/fast/dom/shadow/resources/shadow-dom.js	2012-12-06 13:11:24 UTC (rev 136833)
+++ trunk/LayoutTests/fast/dom/shadow/resources/shadow-dom.js	2012-12-06 13:38:47 UTC (rev 136834)
@@ -81,7 +81,7 @@
         else
             return null;
         if (ids[i] != '')
-            node = internals.getElementByIdInShadowRoot(node, ids[i]);
+            node = node.getElementById(ids[i]);
     }
     return node;
 }

Modified: trunk/Source/WebCore/ChangeLog (136833 => 136834)


--- trunk/Source/WebCore/ChangeLog	2012-12-06 13:11:24 UTC (rev 136833)
+++ trunk/Source/WebCore/ChangeLog	2012-12-06 13:38:47 UTC (rev 136834)
@@ -1,3 +1,21 @@
+2012-12-06  Shinya Kawanaka  <[email protected]>
+
+        Internals.getElementByIdInShadowRoot is nonsense now.
+        https://bugs.webkit.org/show_bug.cgi?id=104241
+
+        Reviewed by Kent Tamura.
+
+        Since we have ShadowRoot.getElementById() now, we don't need Internals.getElementByIdInShadowRoot, which is
+        the same functionality of ShadowRoot.getElementById().
+
+        Test: fast/dom/shadow/get-element-by-id-in-shadow-root.html
+
+        * WebCore.exp.in:
+        * testing/Internals.cpp:
+        * testing/Internals.h:
+        (Internals):
+        * testing/Internals.idl:
+
 2012-12-06  Kondapally Kalyan  <[email protected]>
 
         [EFL] Active texture state gets corrupted after updating graphics surface contents.

Modified: trunk/Source/WebCore/WebCore.exp.in (136833 => 136834)


--- trunk/Source/WebCore/WebCore.exp.in	2012-12-06 13:11:24 UTC (rev 136833)
+++ trunk/Source/WebCore/WebCore.exp.in	2012-12-06 13:38:47 UTC (rev 136834)
@@ -1478,7 +1478,6 @@
 __ZNK7WebCore9FrameView28isEnclosedInCompositingLayerEv
 __ZNK7WebCore9PageCache10frameCountEv
 __ZNK7WebCore9PageCache21autoreleasedPageCountEv
-__ZNK7WebCore9TreeScope14getElementByIdERKN3WTF12AtomicStringE
 __ZTVN7WebCore12ChromeClientE
 __ZTVN7WebCore14LoaderStrategyE
 __ZTVN7WebCore16IconDatabaseBaseE

Modified: trunk/Source/WebCore/testing/Internals.cpp (136833 => 136834)


--- trunk/Source/WebCore/testing/Internals.cpp	2012-12-06 13:11:24 UTC (rev 136833)
+++ trunk/Source/WebCore/testing/Internals.cpp	2012-12-06 13:38:47 UTC (rev 136834)
@@ -291,15 +291,6 @@
     return HTMLContentElement::create(document);
 }
 
-Element* Internals::getElementByIdInShadowRoot(Node* shadowRoot, const String& id, ExceptionCode& ec)
-{
-    if (!shadowRoot || !shadowRoot->isShadowRoot()) {
-        ec = INVALID_ACCESS_ERR;
-        return 0;
-    }
-    return toShadowRoot(shadowRoot)->getElementById(id);
-}
-
 bool Internals::isValidContentSelect(Element* insertionPoint, ExceptionCode& ec)
 {
     if (!insertionPoint || !insertionPoint->isInsertionPoint()) {

Modified: trunk/Source/WebCore/testing/Internals.h (136833 => 136834)


--- trunk/Source/WebCore/testing/Internals.h	2012-12-06 13:11:24 UTC (rev 136833)
+++ trunk/Source/WebCore/testing/Internals.h	2012-12-06 13:38:47 UTC (rev 136834)
@@ -94,7 +94,6 @@
     void setShadowPseudoId(Element*, const String&, ExceptionCode&);
 
     PassRefPtr<Element> createContentElement(Document*, ExceptionCode&);
-    Element* getElementByIdInShadowRoot(Node* shadowRoot, const String& id, ExceptionCode&);
     bool isValidContentSelect(Element* insertionPoint, ExceptionCode&);
     Node* treeScopeRootNode(Node*, ExceptionCode&);
     Node* parentTreeScope(Node*, ExceptionCode&);

Modified: trunk/Source/WebCore/testing/Internals.idl (136833 => 136834)


--- trunk/Source/WebCore/testing/Internals.idl	2012-12-06 13:11:24 UTC (rev 136833)
+++ trunk/Source/WebCore/testing/Internals.idl	2012-12-06 13:38:47 UTC (rev 136834)
@@ -55,7 +55,6 @@
     DOMString shadowPseudoId(in Element element) raises (DOMException);
     void setShadowPseudoId(in Element element, in DOMString id) raises (DOMException);
     Element createContentElement(in Document document) raises(DOMException);
-    Element getElementByIdInShadowRoot(in Node shadowRoot, in DOMString id) raises(DOMException);
     boolean isValidContentSelect(in Element contentElement) raises(DOMException);
     Node treeScopeRootNode(in Node node) raises (DOMException);
     Node parentTreeScope(in Node node) raises (DOMException);

Modified: trunk/Source/WebKit2/ChangeLog (136833 => 136834)


--- trunk/Source/WebKit2/ChangeLog	2012-12-06 13:11:24 UTC (rev 136833)
+++ trunk/Source/WebKit2/ChangeLog	2012-12-06 13:38:47 UTC (rev 136834)
@@ -1,3 +1,12 @@
+2012-12-06  Shinya Kawanaka  <[email protected]>
+
+        Internals.getElementByIdInShadowRoot is nonsense now.
+        https://bugs.webkit.org/show_bug.cgi?id=104241
+
+        Reviewed by Kent Tamura.
+
+        * win/WebKit2.def.in:
+
 2012-12-06  Christophe Dumez  <[email protected]>
 
         [EFL][WK2] Context clients should unregister themselves when destroyed

Modified: trunk/Source/WebKit2/win/WebKit2.def.in (136833 => 136834)


--- trunk/Source/WebKit2/win/WebKit2.def.in	2012-12-06 13:11:24 UTC (rev 136833)
+++ trunk/Source/WebKit2/win/WebKit2.def.in	2012-12-06 13:38:47 UTC (rev 136834)
@@ -194,7 +194,6 @@
         ?garbageCollectDocumentResources@CachedResourceLoader@WebCore@@QAEXXZ
         ?getCachedDOMStructure@WebCore@@YAPAVStructure@JSC@@PAVJSDOMGlobalObject@1@PBUClassInfo@3@@Z
         ?getData16SlowCase@StringImpl@WTF@@ABEPB_WXZ
-        ?getElementById@TreeScope@WebCore@@QBEPAVElement@2@ABVAtomicString@WTF@@@Z
         ?getLocationAndLengthFromRange@TextIterator@WebCore@@SA_NPAVElement@2@PBVRange@2@AAI2@Z
         ?getReferencedFilePaths@FormController@WebCore@@SA?AV?$Vector@VString@WTF@@$0A@@WTF@@ABV34@@Z
         ?countElementShadow@ShadowRoot@WebCore@@QBEIXZ

Modified: trunk/Source/autotools/symbols.filter (136833 => 136834)


--- trunk/Source/autotools/symbols.filter	2012-12-06 13:11:24 UTC (rev 136833)
+++ trunk/Source/autotools/symbols.filter	2012-12-06 13:38:47 UTC (rev 136834)
@@ -151,7 +151,6 @@
 _ZNK7WebCore8Document8settingsEv;
 _ZNK7WebCore8Document4viewEv;
 _ZNK7WebCore5Range4textEv;
-_ZNK7WebCore9TreeScope14getElementByIdERKN3WTF12AtomicStringE;
 _ZN7WebCore22counterValueForElementEPNS_7ElementE;
 _ZNK7WebCore14DocumentMarker11descriptionEv;
 _ZN7WebCore8Document16isPageBoxVisibleEi;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to