[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
tony at chromium.org
tony at chromium.org
Fri Jan 21 15:16:09 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit ae7e202e6792383d22079e2f8013d5d8a0ebc1ac
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 10 19:31:52 2011 +0000
2011-01-10 Tony Chang <tony at chromium.org>
Reviewed by Mihai Parparita.
[chromium] fix for animated gif layout tests
https://bugs.webkit.org/show_bug.cgi?id=52008
Remove incorrect baselines.
* platform/chromium-win/fast/backgrounds/animated-gif-as-background-expected.checksum: Removed.
* platform/chromium-win/fast/backgrounds/animated-gif-as-background-expected.png: Removed.
* platform/chromium/test_expectations.txt:
2011-01-10 Tony Chang <tony at chromium.org>
Reviewed by Mihai Parparita.
[chromium] fix for animated gif layout tests
https://bugs.webkit.org/show_bug.cgi?id=52008
* DumpRenderTree/chromium/WebViewHost.cpp: Schedule a paint when we update the paint rect
to trigger gif animations.
(WebViewHostPaintTask::WebViewHostPaintTask):
(WebViewHostPaintTask::runIfValid):
(WebViewHost::updatePaintRect):
* DumpRenderTree/chromium/WebViewHost.h:
(WebViewHost::taskList):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75398 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ce0717d..5f8e781 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-10 Tony Chang <tony at chromium.org>
+
+ Reviewed by Mihai Parparita.
+
+ [chromium] fix for animated gif layout tests
+ https://bugs.webkit.org/show_bug.cgi?id=52008
+
+ Remove incorrect baselines.
+
+ * platform/chromium-win/fast/backgrounds/animated-gif-as-background-expected.checksum: Removed.
+ * platform/chromium-win/fast/backgrounds/animated-gif-as-background-expected.png: Removed.
+ * platform/chromium/test_expectations.txt:
+
2011-01-10 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r75341.
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
deleted file mode 100644
index ea90b80..0000000
--- a/LayoutTests/platform/chromium-win/fast/backgrounds/animated-gif-as-background-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 6d9a0e4..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/backgrounds/animated-gif-as-background-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 80565b9..1eff090 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2851,9 +2851,9 @@ BUGCR65279 LINUX DEBUG : fast/css/visited-link-hang.html = TEXT PASS
// Regressions caused by switching to DRT.
///////////////////////////////////////////////////////////////////////////
-// 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
+// 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
// input-speech related failures
BUG_DRT WIN MAC : fast/speech/input-appearance-numberandspeech.html = IMAGE
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 6e51c08..36eff69 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-10 Tony Chang <tony at chromium.org>
+
+ Reviewed by Mihai Parparita.
+
+ [chromium] fix for animated gif layout tests
+ https://bugs.webkit.org/show_bug.cgi?id=52008
+
+ * DumpRenderTree/chromium/WebViewHost.cpp: Schedule a paint when we update the paint rect
+ to trigger gif animations.
+ (WebViewHostPaintTask::WebViewHostPaintTask):
+ (WebViewHostPaintTask::runIfValid):
+ (WebViewHost::updatePaintRect):
+ * DumpRenderTree/chromium/WebViewHost.h:
+ (WebViewHost::taskList):
+
2011-01-10 Alejandro G. Castro <alex at igalia.com>
Reviewed by Xan Lopez.
diff --git a/Tools/DumpRenderTree/chromium/WebViewHost.cpp b/Tools/DumpRenderTree/chromium/WebViewHost.cpp
index f5dd7fd..ce0ee7a 100644
--- a/Tools/DumpRenderTree/chromium/WebViewHost.cpp
+++ b/Tools/DumpRenderTree/chromium/WebViewHost.cpp
@@ -656,8 +656,6 @@ void WebViewHost::show(WebNavigationPolicy)
updatePaintRect(WebRect(0, 0, size.width, size.height));
}
-
-
void WebViewHost::closeWidget()
{
m_hasWindow = false;
@@ -1407,6 +1405,13 @@ 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
@@ -1421,6 +1426,8 @@ 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 86c23a5..e96a717 100644
--- a/Tools/DumpRenderTree/chromium/WebViewHost.h
+++ b/Tools/DumpRenderTree/chromium/WebViewHost.h
@@ -32,6 +32,7 @@
#define WebViewHost_h
#include "MockSpellCheck.h"
+#include "Task.h"
#include "TestNavigationController.h"
#include "WebAccessibilityNotification.h"
#include "WebCursorInfo.h"
@@ -100,6 +101,9 @@ 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);
@@ -308,6 +312,8 @@ private:
WebKit::WebRect m_paintRect;
bool m_isPainting;
+ TaskList m_taskList;
+
OwnPtr<WebKit::WebContextMenuData> m_lastContextMenuData;
// Geolocation
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list