[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

apavlov at chromium.org apavlov at chromium.org
Wed Dec 22 17:54:12 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 7aabd4c4eb10ce72d65d6d9f5dc7c5f6937cc0a3
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 2 12:33:05 2010 +0000

    2010-12-02  Alexander Pavlov  <apavlov at chromium.org>
    
            Unreviewed, build fix.
    
             * http/tests/inspector/inspect-iframe-from-different-domain.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73122 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d7f942b..ce95564 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-02  Alexander Pavlov  <apavlov at chromium.org>
+
+        Unreviewed, build fix.
+
+         * http/tests/inspector/inspect-iframe-from-different-domain.html:
+
 2010-12-01  Alexander Pavlov  <apavlov at chromium.org>
 
         Reviewed by Yury Semikhatsky.
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 46d5e0e..1416db6 100644
--- a/LayoutTests/http/tests/inspector/inspect-iframe-from-different-domain.html
+++ b/LayoutTests/http/tests/inspector/inspect-iframe-from-different-domain.html
@@ -77,7 +77,7 @@ function frontend_dumpIFrameBackground(testController)
                 }
 
                 for (var i = styles.matchedCSSRules.length - 1; i >= 0; --i) {
-                    var rule = WebInspector.CSSRule.parsePayload(styles.matchedCSSRules[i]);
+                    var rule = styles.matchedCSSRules[i];
                     if (rule.isUser || rule.isUserAgent)
                         continue;
                     var bg = rule.style.getShorthandValue("background");
@@ -90,7 +90,7 @@ function frontend_dumpIFrameBackground(testController)
                 testController.notifyDone("Background property not found");
             }
 
-            InspectorBackend.getStyles(domNode.id, true, callback);
+            WebInspector.cssModel.getStylesAsync(domNode.id, callback);
         });
     });
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list