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

[darin at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 61c1222e26bf7830e232ecaf4aa4e8884a9f905a
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 4 09:13:27 2010 +0000

    2010-03-04  Darin Fisher  <darin at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Fix failing DevToolsSanityTest.TestResourceContentLength
            https://bugs.webkit.org/show_bug.cgi?id=35725
    
            http://trac.webkit.org/changeset/55466 missed one more spot
            where contentLength needed to be renamed resourceSize.
    
            * src/js/Tests.js:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55512 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 012ea07..82cf1da 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-04  Darin Fisher  <darin at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Fix failing DevToolsSanityTest.TestResourceContentLength
+        https://bugs.webkit.org/show_bug.cgi?id=35725
+
+        http://trac.webkit.org/changeset/55466 missed one more spot
+        where contentLength needed to be renamed resourceSize.
+
+        * src/js/Tests.js:
+
 2010-03-03  Garret Kelly  <gdk at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/js/Tests.js b/WebKit/chromium/src/js/Tests.js
index ce1ecbf..c157fdf 100644
--- a/WebKit/chromium/src/js/Tests.js
+++ b/WebKit/chromium/src/js/Tests.js
@@ -298,16 +298,16 @@ TestSuite.prototype.testResourceContentLength = function()
             if (resource.url.search("image.html") !== -1) {
               var expectedLength = 87;
               test.assertTrue(
-                  resource.contentLength <= expectedLength,
+                  resource.resourceSize <= expectedLength,
                   "image.html content length is greater thatn expected.");
-              if (expectedLength === resource.contentLength)
+              if (expectedLength === resource.resourceSize)
                   html = true;
             } else if (resource.url.search("image.png") !== -1) {
               var expectedLength = 257796;
               test.assertTrue(
-                  resource.contentLength <= expectedLength,
+                  resource.resourceSize <= expectedLength,
                   "image.png content length is greater than expected.");
-              if (expectedLength === resource.contentLength)
+              if (expectedLength === resource.resourceSize)
                   png = true;
             }
             if (html && png) {

-- 
WebKit Debian packaging