[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit d374b95fe56c6aacb878256e576d09638dcb931f
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 16 16:21:39 2010 +0000

    2010-03-16  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed: inspector http test fix that migrates it to the new inspector api.
    
            * http/tests/inspector/inspect-iframe-from-different-domain.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56067 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e1fad62..a70782e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-16  Pavel Feldman  <pfeldman at chromium.org>
+
+        Not reviewed: inspector http test fix that migrates it to the new inspector api.
+
+        * http/tests/inspector/inspect-iframe-from-different-domain.html:
+
 2010-03-11  Antonio Gomes  <tonikitoo at webkit.org>
 
         Reviewed by Simon Fraser.
diff --git a/LayoutTests/http/tests/inspector/inspect-iframe-from-different-domain.html b/LayoutTests/http/tests/inspector/inspect-iframe-from-different-domain.html
index 033d3d5..3f8e607 100644
--- a/LayoutTests/http/tests/inspector/inspect-iframe-from-different-domain.html
+++ b/LayoutTests/http/tests/inspector/inspect-iframe-from-different-domain.html
@@ -68,17 +68,29 @@ function frontend_dumpIFrameBackground(testController)
         // Set focus to the iframe body node and then check its style.
         WebInspector.panels.elements.focusedDOMNode = domNode;
         testController.runAfterPendingDispatches(function() {
-            for (var i = 0; i < domNode._matchedCSSRules.length; i++) {
-                var rule = domNode._matchedCSSRules[i];
-                if (rule.isUser || rule.isUserAgent)
-                    continue;
-                var bg = rule.style.getShorthandValue("background");
-                if (bg) {
-                    testController.notifyDone("background = " + bg);
+
+            function callback(styles)
+            {
+                if (!styles) {
+                    testController.notifyDone("Background property not found");
                     return;
                 }
+
+                for (var i = styles.matchedCSSRules.length - 1; i >= 0; --i) {
+                    var rule = WebInspector.CSSStyleDeclaration.parseRule(styles.matchedCSSRules[i]);
+                    if (rule.isUser || rule.isUserAgent)
+                        continue;
+                    var bg = rule.style.getShorthandValue("background");
+                    if (bg) {
+                        testController.notifyDone("background = " + bg);
+                        return;
+                    }
+                }
+                    
+                testController.notifyDone("Background property not found");
             }
-            testController.notifyDone("Background property not found");
+
+            InspectorBackend.getStyles(WebInspector.Callback.wrap(callback), domNode.id, true);
         });
     });
 }

-- 
WebKit Debian packaging