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

yurys at chromium.org yurys at chromium.org
Wed Dec 22 11:40:26 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit e48375aa195b56f484b69672422ca855dfdceeb9
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 3 14:53:46 2010 +0000

    2010-08-03  Yury Semikhatsky  <yurys at chromium.org>
    
            Unreviewed. Fix Chromium interactive UI tests.
    
            * src/js/Tests.js:
            (.TestSuite.prototype.testResourceHeaders):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64554 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 58ba27d..5003e53 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-03  Yury Semikhatsky  <yurys at chromium.org>
+
+        Unreviewed. Fix Chromium interactive UI tests.
+
+        * src/js/Tests.js:
+        (.TestSuite.prototype.testResourceHeaders):
+
 2010-07-30  Andrei Popescu  <andreip at dhcp-172-16-14-12.lon.corp.google.com>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebKit/chromium/src/js/Tests.js b/WebKit/chromium/src/js/Tests.js
index e2ab3b3..b5bce28 100644
--- a/WebKit/chromium/src/js/Tests.js
+++ b/WebKit/chromium/src/js/Tests.js
@@ -261,10 +261,10 @@ TestSuite.prototype.testEnableResourcesTab = function()
 
     var test = this;
     this.addSniffer(WebInspector, "updateResource",
-        function(identifier, payload) {
+        function(payload) {
             test.assertEquals("simple_page.html", payload.lastPathComponent);
             WebInspector.panels.resources.refresh();
-            WebInspector.panels.resources.revealAndSelectItem(WebInspector.resources[identifier]);
+            WebInspector.panels.resources.revealAndSelectItem(WebInspector.resources[payload.id]);
 
             test.releaseControl();
         });
@@ -289,10 +289,10 @@ TestSuite.prototype.testResourceContentLength = function()
     var png = false;
     var html = false;
     this.addSniffer(WebInspector, "updateResource",
-        function(identifier, payload) {
+        function(payload) {
             if (!payload.didLengthChange)
                 return;
-            var resource = WebInspector.resources[identifier];
+            var resource = WebInspector.resources[payload.id];
             if (!resource || !resource.url)
                 return;
             if (resource.url.search("image.html") !== -1) {
@@ -346,8 +346,8 @@ TestSuite.prototype.testResourceHeaders = function()
     var timingOk = false;
 
     this.addSniffer(WebInspector, "updateResource",
-        function(identifier, payload) {
-            var resource = this.resources[identifier];
+        function(payload) {
+            var resource = this.resources[payload.id];
             if (!resource || resource.mainResource) {
                 // We are only interested in secondary resources in this test.
                 return;
@@ -393,8 +393,8 @@ TestSuite.prototype.testCachedResourceMimeType = function()
     var hasReloaded = false;
 
     this.addSniffer(WebInspector, "updateResource",
-        function(identifier, payload) {
-            var resource = this.resources[identifier];
+        function(payload) {
+            var resource = this.resources[payload.id];
             if (!resource || resource.mainResource) {
                 // We are only interested in secondary resources in this test.
                 return;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list