2011-01-10 Tony Chang <tony@chromium.org>

        Unreviewed, rolling out r75398, r75407,
        http://trac.webkit.org/changeset/75398
        https://bugs.webkit.org/show_bug.cgi?id=52008

        Some layout tests are crashing on Chromium Win.

        * platform/chromium-win/fast/backgrounds/animated-gif-as-background-expected.checksum: Added.
        * platform/chromium-win/fast/backgrounds/animated-gif-as-background-expected.png: Added.
        * platform/chromium/test_expectations.txt:
2011-01-10  Tony Chang  <tony@chromium.org>

        Unreviewed, rolling out r75398.
        http://trac.webkit.org/changeset/75398
        https://bugs.webkit.org/show_bug.cgi?id=52008

        Some layout tests are crashing on Chromium Win.

        * DumpRenderTree/chromium/WebViewHost.cpp:
        (WebViewHost::updatePaintRect):
        * DumpRenderTree/chromium/WebViewHost.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@75433 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a8863d5f418feee9cc392a38886d20f8858b4cbd..467ebbe245f4f97270ca5bc83ff5daf03bad1552 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-10  Tony Chang  <tony@chromium.org>
+
+        Unreviewed, rolling out r75398, r75407,
+        http://trac.webkit.org/changeset/75398
+        https://bugs.webkit.org/show_bug.cgi?id=52008
+
+        Some layout tests are crashing on Chromium Win.
+
+        * platform/chromium-win/fast/backgrounds/animated-gif-as-background-expected.checksum: Added.
+        * platform/chromium-win/fast/backgrounds/animated-gif-as-background-expected.png: Added.
+        * platform/chromium/test_expectations.txt:
+
 2011-01-10  Mihai Parparita  <mihaip@chromium.org>
 
         Unreviewed Chromium test expectations update.

diff --git a/LayoutTests/platform/chromium-win/fast/backgrounds/animated-gif-as-background-expected.checksum b/LayoutTests/platform/chromium-win/fast/backgrounds/animated-gif-as-background-expected.checksum
new file mode 100644 (file)
index 0000000..ea90b80
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/fast/backgrounds/animated-gif-as-background-expected.checksum
@@ -0,0 +1 @@
+55386cdd10b4fda864ed14b4cd869077
\ No newline at end of file

diff --git a/LayoutTests/platform/chromium-win/fast/backgrounds/animated-gif-as-background-expected.png b/LayoutTests/platform/chromium-win/fast/backgrounds/animated-gif-as-background-expected.png
new file mode 100644 (file)
index 0000000..6d9a0e4
Binary files /dev/null and b/LayoutTests/platform/chromium-win/fast/backgrounds/animated-gif-as-background-expected.png differ

diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 10ac174c235c5216f09e08e6827010ff105dd393..384021247c5e5c2e9596670fdc8bf5a048bee59b 100644 (file)
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -892,6 +892,9 @@ BUGCR11153 WIN LINUX : fast/canvas/canvas-incremental-repaint.html = FAIL
 
 BUGCR20507 : http/tests/uri/resolve-encoding-relative.html = FAIL
 
+// test_shell, DRT do not correctly schedule paints when invalidating.
+BUGCR62433 WIN : fast/images/gif-loop-count.html = IMAGE
+
 // -----------------------------------------------------------------
 // SVG TESTS
 // -----------------------------------------------------------------
@@ -2848,9 +2851,9 @@ BUGCR65279 LINUX DEBUG : fast/css/visited-link-hang.html = TEXT PASS
 // Regressions caused by switching to DRT.
 ///////////////////////////////////////////////////////////////////////////
 
-// These need to be rebaselined on Windows.
-BUGCR62433 WIN : fast/backgrounds/animated-gif-as-background.html = IMAGE
-BUGCR62433 WIN : fast/images/gif-loop-count.html = IMAGE
+// DRT needs to schedule paints on invalidations like Chrome does.
+BUGCR62433 MAC LINUX : fast/backgrounds/animated-gif-as-background.html = IMAGE
+BUGCR62433 MAC LINUX : fast/images/gif-loop-count.html = IMAGE
 
 // input-speech related failures
 BUG_DRT WIN MAC : fast/speech/input-appearance-numberandspeech.html = IMAGE

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 90b9789ce9d1f663aca768981ff247c5ba432adc..d0d6916f2f1166bb5152f5c4df3c5e0a9f2df022 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-10  Tony Chang  <tony@chromium.org>
+
+        Unreviewed, rolling out r75398.
+        http://trac.webkit.org/changeset/75398
+        https://bugs.webkit.org/show_bug.cgi?id=52008
+
+        Some layout tests are crashing on Chromium Win.
+
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        (WebViewHost::updatePaintRect):
+        * DumpRenderTree/chromium/WebViewHost.h:
+
 2011-01-10  Adam Roben  <aroben@apple.com>
 
         Roll out r75392

diff --git a/Tools/DumpRenderTree/chromium/WebViewHost.cpp b/Tools/DumpRenderTree/chromium/WebViewHost.cpp
index ce0ee7a1f4c2d03f9f9ed759c70883bd98b16cfb..f5dd7fdbc539c14c38f1abafbc6acfae7375fa39 100644 (file)
--- a/Tools/DumpRenderTree/chromium/WebViewHost.cpp
+++ b/Tools/DumpRenderTree/chromium/WebViewHost.cpp
@@ -656,6 +656,8 @@ void WebViewHost::show(WebNavigationPolicy)
     updatePaintRect(WebRect(0, 0, size.width, size.height));
 }
 
+
+
 void WebViewHost::closeWidget()
 {
     m_hasWindow = false;
@@ -1405,13 +1407,6 @@ void WebViewHost::setAddressBarURL(const WebURL&)
 
 // Painting functions ---------------------------------------------------------
 
-class WebViewHostPaintTask : public MethodTask<WebViewHost> {
-public:
-    WebViewHostPaintTask(WebViewHost* object)
-        : MethodTask<WebViewHost>(object) {}
-    virtual void runIfValid() { m_object->paintInvalidatedRegion(); }
-};
-
 void WebViewHost::updatePaintRect(const WebRect& rect)
 {
     // m_paintRect = m_paintRect U rect
@@ -1426,8 +1421,6 @@ void WebViewHost::updatePaintRect(const WebRect& rect)
     int right = max(m_paintRect.x + m_paintRect.width, rect.x + rect.width);
     int bottom = max(m_paintRect.y + m_paintRect.height, rect.y + rect.height);
     m_paintRect = WebRect(left, top, right - left, bottom - top);
-
-    postDelayedTask(new WebViewHostPaintTask(this), 0);
 }
 
 void WebViewHost::paintRect(const WebRect& rect)

diff --git a/Tools/DumpRenderTree/chromium/WebViewHost.h b/Tools/DumpRenderTree/chromium/WebViewHost.h
index e96a717cd860ac158ff82101d30f4610568b6093..86c23a5607bd8021852b5b1e9a4ade016dc98e75 100644 (file)
--- a/Tools/DumpRenderTree/chromium/WebViewHost.h
+++ b/Tools/DumpRenderTree/chromium/WebViewHost.h
@@ -32,7 +32,6 @@
 #define WebViewHost_h
 
 #include "MockSpellCheck.h"
-#include "Task.h"
 #include "TestNavigationController.h"
 #include "WebAccessibilityNotification.h"
 #include "WebCursorInfo.h"
@@ -101,9 +100,6 @@ class WebViewHost : public WebKit::WebViewClient, public WebKit::WebFrameClient,
 
     WebKit::WebSpeechInputControllerMock* speechInputControllerMock() { return m_speechInputControllerMock.get(); }
 
-    // Needed by the MethodTask template.
-    TaskList* taskList() { return &m_taskList; }
-
     // NavigationHost
     virtual bool navigate(const TestNavigationEntry&, bool reload);
 
@@ -312,8 +308,6 @@ private:
     WebKit::WebRect m_paintRect;
     bool m_isPainting;
 
-    TaskList m_taskList;
-
     OwnPtr<WebKit::WebContextMenuData> m_lastContextMenuData;
 
     // Geolocation