[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[robert at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit e1934c685c40186aaf5f156521e11213c0f43bcc
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 19 22:14:45 2011 +0000

    2011-01-19  Robert Hogan  <robert at webkit.org>
    
            Unreviewed fix to r76153.
    
            [Qt] Update expected results after r76153
    
            Update missing expected results from r76153. Matches Mac.
            Re-skip http/tests/misc/timer-vs-loading.html - it still times
            out on the build bot.
    
            https://bugs.webkit.org/show_bug.cgi?id=52395
    
            * platform/qt/Skipped:
            * platform/qt/http/tests/loading/simple-subframe-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76161 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 30f010f..375968b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-19  Robert Hogan  <robert at webkit.org>
+
+        Unreviewed fix to r76153.
+
+        [Qt] Update expected results after r76153
+
+        Update missing expected results from r76153. Matches Mac.
+        Re-skip http/tests/misc/timer-vs-loading.html - it still times
+        out on the build bot.
+
+        https://bugs.webkit.org/show_bug.cgi?id=52395
+
+        * platform/qt/Skipped:
+        * platform/qt/http/tests/loading/simple-subframe-expected.txt:
+
 2011-01-18  Stephen White  <senorblanco at chromium.org>
 
         Reviewed by James Robinson.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 3281956..55368c0 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -243,6 +243,7 @@ http/tests/navigation/timerredirect-goback.html
 # https://webkit.org/b/47060
 http/tests/multipart/invalid-image-data.html
 http/tests/multipart/invalid-image-data-standalone.html
+http/tests/misc/timer-vs-loading.html
 http/tests/multipart/policy-ignore-crash.php
 
 # =========================================================================== #
diff --git a/LayoutTests/platform/qt/http/tests/loading/simple-subframe-expected.txt b/LayoutTests/platform/qt/http/tests/loading/simple-subframe-expected.txt
index 4980a52..49dc479 100644
--- a/LayoutTests/platform/qt/http/tests/loading/simple-subframe-expected.txt
+++ b/LayoutTests/platform/qt/http/tests/loading/simple-subframe-expected.txt
@@ -1,14 +1,11 @@
 main frame - didStartProvisionalLoadForFrame
-main frame - willCloseFrame
 main frame - didCommitLoadForFrame
-main frame - didClearWindowObjectForFrame
 frame "f1" - didStartProvisionalLoadForFrame
 main frame - didFinishDocumentLoadForFrame
-frame "f1" - willCloseFrame
 frame "f1" - didCommitLoadForFrame
+frame "f1" - didFinishDocumentLoadForFrame
 frame "f1" - didHandleOnloadEventsForFrame
 main frame - didHandleOnloadEventsForFrame
-frame "f1" - didFinishDocumentLoadForFrame
 frame "f1" - didFinishLoadForFrame
 main frame - didFinishLoadForFrame
 layer at (0,0) size 800x600
@@ -16,16 +13,16 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 485x19
-        text run at (0,0) width 485: "This is a test of load callbacks. It is only useful inside the regression test tool."
-      RenderBR {BR} at (485,14) size 0x0
-      RenderPartObject {IFRAME} at (0,19) size 304x154 [border: (2px inset #000000)]
+      RenderText {#text} at (0,0) size 510x21
+        text run at (0,0) width 510: "This is a test of load callbacks. It is only useful inside the regression test tool."
+      RenderBR {BR} at (510,16) size 0x0
+      RenderPartObject {IFRAME} at (0,21) size 304x154 [border: (2px inset #000000)]
         layer at (0,0) size 300x150
           RenderView at (0,0) size 300x150
         layer at (0,0) size 300x150
           RenderBlock {HTML} at (0,0) size 300x150
             RenderBody {BODY} at (8,8) size 284x134
-              RenderInline {B} at (0,0) size 26x20
-                RenderText {#text} at (0,0) size 26x20
-                  text run at (0,0) width 26: "test"
+              RenderInline {B} at (0,0) size 23x21
+                RenderText {#text} at (0,0) size 23x21
+                  text run at (0,0) width 23: "test"
       RenderText {#text} at (0,0) size 0x0

-- 
WebKit Debian packaging