[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
senorblanco at chromium.org
senorblanco at chromium.org
Wed Dec 22 13:41:06 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit cf42daca2c62873e3a7752602319f4440f59271d
Author: senorblanco at chromium.org <senorblanco at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 23 14:24:10 2010 +0000
2010-09-21 Stephen White <senorblanco at chromium.org>
Reviewed by David Levin.
Implement --enable-accelerated-2d-canvas flag in DumpRenderTree.
https://bugs.webkit.org/show_bug.cgi?id=46208
This flag allows the layout tests to be run with or without accelerated
2D canvas rendering.
* DumpRenderTree/chromium/DumpRenderTree.cpp:
(main):
Declare the new flag string, and check for it on startup.
* DumpRenderTree/chromium/TestShell.cpp:
(TestShell::TestShell):
Add a boolean for the new flag, in order to preserve its value over
preferences reset.
(TestShell::resetWebSettings):
Set the new flag to the stored value on reset.
* DumpRenderTree/chromium/TestShell.h:
(TestShell::setAccelerated2dCanvasEnabled):
Add an accessor for the new flag.
* DumpRenderTree/chromium/WebPreferences.cpp:
(WebPreferences::reset):
Initialize the new flag to false.
(WebPreferences::applyTo):
Copy the flag's value to the WebSettings.
* DumpRenderTree/chromium/WebPreferences.h:
Add the new flag.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68136 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9b59d17..f1143b8 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,33 @@
+2010-09-21 Stephen White <senorblanco at chromium.org>
+
+ Reviewed by David Levin.
+
+ Implement --enable-accelerated-2d-canvas flag in DumpRenderTree.
+ https://bugs.webkit.org/show_bug.cgi?id=46208
+
+ This flag allows the layout tests to be run with or without accelerated
+ 2D canvas rendering.
+
+ * DumpRenderTree/chromium/DumpRenderTree.cpp:
+ (main):
+ Declare the new flag string, and check for it on startup.
+ * DumpRenderTree/chromium/TestShell.cpp:
+ (TestShell::TestShell):
+ Add a boolean for the new flag, in order to preserve its value over
+ preferences reset.
+ (TestShell::resetWebSettings):
+ Set the new flag to the stored value on reset.
+ * DumpRenderTree/chromium/TestShell.h:
+ (TestShell::setAccelerated2dCanvasEnabled):
+ Add an accessor for the new flag.
+ * DumpRenderTree/chromium/WebPreferences.cpp:
+ (WebPreferences::reset):
+ Initialize the new flag to false.
+ (WebPreferences::applyTo):
+ Copy the flag's value to the WebSettings.
+ * DumpRenderTree/chromium/WebPreferences.h:
+ Add the new flag.
+
2010-09-23 Tor Arne Vestbø <tor.arne.vestbo at nokia.com>
Reviewed by Simon Hausmann.
diff --git a/WebKitTools/DumpRenderTree/chromium/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/chromium/DumpRenderTree.cpp
index 6e180d0..b2e50f7 100644
--- a/WebKitTools/DumpRenderTree/chromium/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/DumpRenderTree.cpp
@@ -48,6 +48,7 @@ static const char optionTestShell[] = "--test-shell";
static const char optionAllowExternalPages[] = "--allow-external-pages";
static const char optionStartupDialog[] = "--testshell-startup-dialog";
static const char optionCheckLayoutTestSystemDeps[] = "--check-layout-test-sys-deps";
+static const char optionEnableAccelerated2DCanvas[] = "--enable-accelerated-2d-canvas";
static void runTest(TestShell& shell, TestParams& params, const string& testName, bool testShellMode)
{
@@ -92,6 +93,7 @@ int main(int argc, char* argv[])
bool testShellMode = false;
bool allowExternalPages = false;
bool startupDialog = false;
+ bool accelerated2DCanvasEnabled = false;
for (int i = 1; i < argc; ++i) {
string argument(argv[i]);
if (argument == "-")
@@ -112,6 +114,8 @@ int main(int argc, char* argv[])
startupDialog = true;
else if (argument == optionCheckLayoutTestSystemDeps)
exit(checkLayoutTestSystemDependencies() ? EXIT_SUCCESS : EXIT_FAILURE);
+ else if (argument == optionEnableAccelerated2DCanvas)
+ accelerated2DCanvasEnabled = true;
else if (argument.size() && argument[0] == '-')
fprintf(stderr, "Unknown option: %s\n", argv[i]);
else
@@ -128,6 +132,7 @@ int main(int argc, char* argv[])
{ // Explicit scope for the TestShell instance.
TestShell shell(testShellMode);
shell.setAllowExternalPages(allowExternalPages);
+ shell.setAccelerated2dCanvasEnabled(accelerated2DCanvasEnabled);
if (serverMode && !tests.size()) {
params.printSeparators = true;
char testString[2048]; // 2048 is the same as the sizes of other platforms.
diff --git a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
index 15d6dee..1a99b7d 100644
--- a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
@@ -83,6 +83,7 @@ TestShell::TestShell(bool testShellMode)
, m_focusedWidget(0)
, m_testShellMode(testShellMode)
, m_allowExternalPages(false)
+ , m_accelerated2dCanvasEnabled(false)
, m_devTools(0)
{
WebRuntimeFeatures::enableGeolocation(true);
@@ -155,6 +156,7 @@ void TestShell::closeDevTools()
void TestShell::resetWebSettings(WebView& webView)
{
m_prefs.reset();
+ m_prefs.accelerated2dCanvasEnabled = m_accelerated2dCanvasEnabled;
m_prefs.applyTo(&webView);
}
diff --git a/WebKitTools/DumpRenderTree/chromium/TestShell.h b/WebKitTools/DumpRenderTree/chromium/TestShell.h
index 6d93d4a..4d022dc 100644
--- a/WebKitTools/DumpRenderTree/chromium/TestShell.h
+++ b/WebKitTools/DumpRenderTree/chromium/TestShell.h
@@ -123,6 +123,8 @@ public:
bool allowExternalPages() const { return m_allowExternalPages; }
void setAllowExternalPages(bool allowExternalPages) { m_allowExternalPages = allowExternalPages; }
+ void setAccelerated2dCanvasEnabled(bool enabled) { m_accelerated2dCanvasEnabled = enabled; }
+
#if defined(OS_WIN)
// Access to the finished event. Used by the static WatchDog thread.
HANDLE finishedEvent() { return m_finishedEvent; }
@@ -176,6 +178,7 @@ private:
TestParams m_params;
int m_timeout; // timeout value in millisecond
bool m_allowExternalPages;
+ bool m_accelerated2dCanvasEnabled;
WebPreferences m_prefs;
// List of all windows in this process.
diff --git a/WebKitTools/DumpRenderTree/chromium/WebPreferences.cpp b/WebKitTools/DumpRenderTree/chromium/WebPreferences.cpp
index 004865a..8d2db1f 100644
--- a/WebKitTools/DumpRenderTree/chromium/WebPreferences.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/WebPreferences.cpp
@@ -100,6 +100,7 @@ void WebPreferences::reset()
#endif
tabsToLinks = false;
+ accelerated2dCanvasEnabled = false;
}
void WebPreferences::applyTo(WebView* webView)
@@ -157,5 +158,7 @@ void WebPreferences::applyTo(WebView* webView)
// FIXME: crbug.com/51879
settings->setAcceleratedCompositingEnabled(false);
+
+ settings->setAccelerated2dCanvasEnabled(accelerated2dCanvasEnabled);
}
diff --git a/WebKitTools/DumpRenderTree/chromium/WebPreferences.h b/WebKitTools/DumpRenderTree/chromium/WebPreferences.h
index f197c16..fc3c114 100644
--- a/WebKitTools/DumpRenderTree/chromium/WebPreferences.h
+++ b/WebKitTools/DumpRenderTree/chromium/WebPreferences.h
@@ -75,6 +75,7 @@ struct WebPreferences {
bool allowUniversalAccessFromFileURLs;
WebKit::WebSettings::EditingBehavior editingBehavior;
bool tabsToLinks;
+ bool accelerated2dCanvasEnabled;
WebPreferences() { reset(); }
void reset();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list