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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 5aa91738b0ee3ae0da1a4018016214217affaeda
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 19 19:41:16 2009 +0000

    2009-11-19  Eric Z. Ayers  <zundel at google.com>
    
            Reviewed by Pavel Feldman.
    
            Updated timeline paint test to ignore width and height.  GTK+ testing
            uses a different top level window size than other platforms.
    
            https://bugs.webkit.org/show_bug.cgi?id=31402
    
            * inspector/timeline-paint-expected.txt:
            * inspector/timeline-test.js:
            * platform/win/Skipped:
    2009-11-19  Eric Z. Ayers  <zundel at google.com>
    
            Reviewed by Pavel Feldman.
    
            Forces a WM_PAINT event on calling layoutTestController.display()
            in order to enable the timeline-paint.html test on Windows.
            ::UpdateWindow() does not force an event becaue the window is
            not visible.
    
            https://bugs.webkit.org/show_bug.cgi?id=31402
    
            * DumpRenderTree/win/DumpRenderTree.cpp:
            (displayWebView):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51196 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index fe658ff..36c29f7 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-19  Eric Z. Ayers  <zundel at google.com>
+
+        Reviewed by Pavel Feldman.
+
+        Updated timeline paint test to ignore width and height.  GTK+ testing
+        uses a different top level window size than other platforms.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31402
+
+        * inspector/timeline-paint-expected.txt:
+        * inspector/timeline-test.js:
+        * platform/win/Skipped:
+
 2009-11-19  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/inspector/timeline-paint-expected.txt b/LayoutTests/inspector/timeline-paint-expected.txt
index 113c7f2..c1a0e45 100644
--- a/LayoutTests/inspector/timeline-paint-expected.txt
+++ b/LayoutTests/inspector/timeline-paint-expected.txt
@@ -5,8 +5,8 @@ Paint Properties:
 + data : {
 +- x : 0
 +- y : 0
-+- width : 800
-+- height : 350
++- width : * DEFINED *
++- height : * DEFINED *
 + }
 + children : * DEFINED *
 + endTime : * DEFINED *
diff --git a/LayoutTests/inspector/timeline-test.js b/LayoutTests/inspector/timeline-test.js
index 00bb770..c32fbfd 100644
--- a/LayoutTests/inspector/timeline-test.js
+++ b/LayoutTests/inspector/timeline-test.js
@@ -4,7 +4,9 @@ var timelineAgentRecordType = {};
 var timelineNonDeterministicProps = { 
     children : 1,
     endTime : 1, 
+    height : 1,
     startTime : 1,
+    width : 1,
     url : 1
 };
 
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 88d2959..f8207bd 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -697,13 +697,10 @@ fast/dom/HTMLObjectElement/children-changed.html
 # Need rebaseline: https://bugs.webkit.org/show_bug.cgi?id=26830
 fast/multicol/single-line.html
 
-# inspector/timeline-paint passes by itself, but fails when run with other Inspector tests.
-# http://webkit.org/b/31402.
-inspector/timeline-paint.html
-
 # Need to add functionality to DumpRenderTree to handle error pages
 fast/history/back-forward-reset-after-error-handling.html
 
 # WebSocket server doesn't start on Windows.
 # https://bugs.webkit.org/show_bug.cgi?id=31479
 websocket
+
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9bfafdc..8b263e5 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-19  Eric Z. Ayers  <zundel at google.com>
+
+        Reviewed by Pavel Feldman.
+
+        Forces a WM_PAINT event on calling layoutTestController.display()
+        in order to enable the timeline-paint.html test on Windows.
+        ::UpdateWindow() does not force an event becaue the window is 
+        not visible.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31402
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (displayWebView):
+
 2009-11-19  Michelangelo De Simone  <michelangelo at webkit.org>
 
         No review needed.
diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
index 453a8a2..217cb89 100644
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
@@ -286,7 +286,7 @@ static void initialize()
 void displayWebView()
 {
     ::InvalidateRect(webViewWindow, 0, TRUE);
-    ::UpdateWindow(webViewWindow);
+    ::SendMessage(webViewWindow, WM_PAINT, 0, 0);
 }
 
 void dumpFrameScrollPosition(IWebFrame* frame)

-- 
WebKit Debian packaging