Changeset 85849 in webkit

Timestamp:

May 5, 2011 5:14:17 AM (13 years ago)

Author:

caseq@chromium.org

Message:

2011-05-04 Andrey Kosyakov <​caseq@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: add test for shadow DOM access in the console API
​https://bugs.webkit.org/show_bug.cgi?id=60192

• http/tests/inspector/elements-test.js: (initialize_ElementTest.InspectorTest.findNode.processChildren): (initialize_ElementTest.InspectorTest.nodeWithId): (initialize_ElementTest.InspectorTest.selectNode):
• inspector/console/console-shadow-dom-access-expected.txt: Added.
• inspector/console/console-shadow-dom-access.html: Added.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/inspector/elements-test.js (modified) (6 diffs)
• inspector/console/console-shadow-dom-access-expected.txt (added)
• inspector/console/console-shadow-dom-access.html (added)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-04  Andrey Kosyakov  <caseq@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: add test for shadow DOM access in the console API
+        https://bugs.webkit.org/show_bug.cgi?id=60192
+
+        * http/tests/inspector/elements-test.js:
+        (initialize_ElementTest.InspectorTest.findNode.processChildren):
+        (initialize_ElementTest.InspectorTest.nodeWithId):
+        (initialize_ElementTest.InspectorTest.selectNode):
+        * inspector/console/console-shadow-dom-access-expected.txt: Added.
+        * inspector/console/console-shadow-dom-access.html: Added.
+
 2011-05-05  Philippe Normand  <pnormand@igalia.com>
 

trunk/LayoutTests/http/tests/inspector/elements-test.js

@@ -1 +1 @@
 var initialize_ElementTest = function() {
 
-
-InspectorTest.nodeWithId = function(idValue, callback)
+InspectorTest.findNode = function(matchFunction, callback)
 {
     callback = InspectorTest.safeWrap(callback);
@@ -16 +15 @@
         for (var i = 0; children && i < children.length; ++i) {
             var childNode = children[i];
-            if (childNode.getAttribute("id") === idValue) {
+            if (matchFunction(childNode)) {
                 result = childNode;
+                callback(result);
+                return;
+            }
+            if (childNode.shadowRoot && matchFunction(childNode.shadowRoot)) {
+                result = childNode.shadowRoot;
                 callback(result);
                 return;
@@ -43 +47 @@
 };
 
+InspectorTest.nodeWithId = function(idValue, callback)
+{
+    function nodeIdMatches(node)
+    {
+        return node.getAttribute("id") === idValue;
+    }
+    InspectorTest.findNode(nodeIdMatches, callback);
+}
+
 InspectorTest.expandedNodeWithId = function(idValue)
 {
@@ -56 +69 @@
 InspectorTest.selectNodeWithId = function(idValue, callback)
 {
+    function onNodeFound(node)
+    {
+        InspectorTest.selectNode(node, callback);
+    }
+    InspectorTest.nodeWithId(idValue, onNodeFound);
+};
+
+InspectorTest.selectNode = function(node, callback)
+{
     callback = InspectorTest.safeWrap(callback);
-    function mycallback(node)
-    {
-        if (node)
-            WebInspector.updateFocusedNode(node.id);
-        InspectorTest.runAfterPendingDispatches(callback.bind(null, node));
-    }
-    InspectorTest.nodeWithId(idValue, mycallback);
-};
+    if (node)
+        WebInspector.updateFocusedNode(node.id);
+    InspectorTest.runAfterPendingDispatches(callback.bind(null, node));
+}
 
 InspectorTest.dumpSelectedElementStyles = function(excludeComputed, excludeMatched, omitLonghands)
@@ -193 +211 @@
     }
 
-    function mycallback()
+    function onAllNodesAvailable()
     {
         WebInspector.panels.elements.updateModifiedNodes();
@@ -199 +217 @@
         callback();
     }
-    InspectorTest.nodeWithId(/nonstring/, mycallback);
+    InspectorTest.findNode(function() { return false; }, onAllNodesAvailable);
 };