Title: [138025] trunk
Revision
138025
Author
[email protected]
Date
2012-12-18 08:39:15 -0800 (Tue, 18 Dec 2012)

Log Message

Unreviewed, rolling out r137979.
http://trac.webkit.org/changeset/137979
https://bugs.webkit.org/show_bug.cgi?id=105311

nodeName returned by the inspector protocol commands should
match one accessible fro JS (Requested by yurys_ on #webkit).

Patch by Sheriff Bot <[email protected]> on 2012-12-18

Source/WebCore:

* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::buildObjectForNode):

LayoutTests:

* inspector/elements/shadow-dom-modify-chardata-expected.txt:
* inspector/elements/shadow-root-expected.txt:
* inspector/elements/shadow-root.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (138024 => 138025)


--- trunk/LayoutTests/ChangeLog	2012-12-18 16:37:16 UTC (rev 138024)
+++ trunk/LayoutTests/ChangeLog	2012-12-18 16:39:15 UTC (rev 138025)
@@ -1,3 +1,16 @@
+2012-12-18  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r137979.
+        http://trac.webkit.org/changeset/137979
+        https://bugs.webkit.org/show_bug.cgi?id=105311
+
+        nodeName returned by the inspector protocol commands should
+        match one accessible fro JS (Requested by yurys_ on #webkit).
+
+        * inspector/elements/shadow-dom-modify-chardata-expected.txt:
+        * inspector/elements/shadow-root-expected.txt:
+        * inspector/elements/shadow-root.html:
+
 2012-12-18  W. James MacLean  <[email protected]>
 
         [chromium] Unreviewed gardening: marking test as flaky on Linux Dbg bot.

Modified: trunk/LayoutTests/inspector/elements/shadow-dom-modify-chardata-expected.txt (138024 => 138025)


--- trunk/LayoutTests/inspector/elements/shadow-dom-modify-chardata-expected.txt	2012-12-18 16:37:16 UTC (rev 138024)
+++ trunk/LayoutTests/inspector/elements/shadow-dom-modify-chardata-expected.txt	2012-12-18 16:39:15 UTC (rev 138025)
@@ -6,7 +6,7 @@
 ========= Original ========
 - <div id="container">
     - <input type="text" id="input1">
-        - #webkit-shadow-root
+        - #shadow-root
           <div></div>
       </input>
   </div>
@@ -15,7 +15,7 @@
 ======== Type text =========
 - <div id="container">
     - <input type="text" id="input1">
-        - #webkit-shadow-root
+        - #shadow-root
         + <div>Bar</div>
       </input>
   </div>

Modified: trunk/LayoutTests/inspector/elements/shadow-root-expected.txt (138024 => 138025)


--- trunk/LayoutTests/inspector/elements/shadow-root-expected.txt	2012-12-18 16:37:16 UTC (rev 138024)
+++ trunk/LayoutTests/inspector/elements/shadow-root-expected.txt	2012-12-18 16:39:15 UTC (rev 138025)
@@ -1,6 +1,5 @@
 This test verified #shadow-root is displayed when showShadowRoot is enabled.
 
-
 - <div id="container">
     - <div id="test1">
           #shadow-root
@@ -14,9 +13,5 @@
           "with "
           <span>elements</span>
       </div>
-    - <input id="input" type="text">
-        - #webkit-shadow-root
-          <div></div>
-      </input>
   </div>
 

Modified: trunk/LayoutTests/inspector/elements/shadow-root.html (138024 => 138025)


--- trunk/LayoutTests/inspector/elements/shadow-root.html	2012-12-18 16:37:16 UTC (rev 138024)
+++ trunk/LayoutTests/inspector/elements/shadow-root.html	2012-12-18 16:39:15 UTC (rev 138025)
@@ -29,7 +29,6 @@
     <div id="test1"></div>
     <div id="test2">only test</div>
     <div id="test3">with <span>elements</span></div>
-    <input id="input" type="text" />
 </div>
 
 <script>

Modified: trunk/Source/WebCore/ChangeLog (138024 => 138025)


--- trunk/Source/WebCore/ChangeLog	2012-12-18 16:37:16 UTC (rev 138024)
+++ trunk/Source/WebCore/ChangeLog	2012-12-18 16:39:15 UTC (rev 138025)
@@ -1,3 +1,15 @@
+2012-12-18  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r137979.
+        http://trac.webkit.org/changeset/137979
+        https://bugs.webkit.org/show_bug.cgi?id=105311
+
+        nodeName returned by the inspector protocol commands should
+        match one accessible fro JS (Requested by yurys_ on #webkit).
+
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::buildObjectForNode):
+
 2012-12-18  Alexander Pavlov  <[email protected]>
 
         Web Inspector: [Styles] Selector matches are not marked after property editing

Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (138024 => 138025)


--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp	2012-12-18 16:37:16 UTC (rev 138024)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp	2012-12-18 16:39:15 UTC (rev 138025)
@@ -1251,15 +1251,6 @@
         localName = node->localName();
         break;
     case Node::DOCUMENT_FRAGMENT_NODE:
-        if (node->isShadowRoot()) {
-            if (toShadowRoot(node)->type() == ShadowRoot::UserAgentShadowRoot)
-                nodeName = "#webkit-shadow-root";
-            else
-                nodeName = "#shadow-root";
-        } else
-            nodeName = node->nodeName();
-        localName = node->localName();
-        break;
     case Node::DOCUMENT_NODE:
     case Node::ELEMENT_NODE:
     default:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to