Diff
Modified: trunk/Tools/ChangeLog (96789 => 96790)
--- trunk/Tools/ChangeLog 2011-10-06 06:04:20 UTC (rev 96789)
+++ trunk/Tools/ChangeLog 2011-10-06 06:34:02 UTC (rev 96790)
@@ -1,3 +1,24 @@
+2011-10-05 James Robinson <jam...@chromium.org>
+
+ [chromium] Add a command line option to DumpRenderTree and run_webkit_tests.py to enable threaded compositing mode
+ https://bugs.webkit.org/show_bug.cgi?id=69498
+
+ Reviewed by Adam Barth.
+
+ * DumpRenderTree/chromium/DumpRenderTree.cpp:
+ (main):
+ * DumpRenderTree/chromium/TestShell.cpp:
+ (TestShell::TestShell):
+ (TestShell::resetWebSettings):
+ * DumpRenderTree/chromium/TestShell.h:
+ (TestShell::setThreadedCompositingEnabled):
+ * DumpRenderTree/chromium/WebPreferences.cpp:
+ (WebPreferences::reset):
+ (WebPreferences::applyTo):
+ * DumpRenderTree/chromium/WebPreferences.h:
+ * Scripts/webkitpy/layout_tests/port/chromium.py:
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
2011-10-05 Erik Arvidsson <a...@chromium.org>
[QT] Fix DRT after r96779
Modified: trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp (96789 => 96790)
--- trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp 2011-10-06 06:04:20 UTC (rev 96789)
+++ trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp 2011-10-06 06:34:02 UTC (rev 96790)
@@ -54,6 +54,7 @@
static const char optionHardwareAcceleratedGL[] = "--enable-hardware-gpu";
static const char optionEnableAcceleratedCompositing[] = "--enable-accelerated-compositing";
+static const char optionEnableThreadedCompositing[] = "--enable-threaded-compositing";
static const char optionForceCompositingMode[] = "--force-compositing-mode";
static const char optionEnableAccelerated2DCanvas[] = "--enable-accelerated-2d-canvas";
static const char optionEnableLegacyAccelerated2DCanvas[] = "--enable-legacy-accelerated-2d-canvas";
@@ -137,6 +138,7 @@
bool allowExternalPages = false;
bool startupDialog = false;
bool acceleratedCompositingEnabled = false;
+ bool threadedCompositingEnabled = false;
bool compositeToTexture = false;
bool forceCompositingMode = false;
bool accelerated2DCanvasEnabled = false;
@@ -175,6 +177,8 @@
hardwareAcceleratedGL = true;
else if (argument == optionEnableAcceleratedCompositing)
acceleratedCompositingEnabled = true;
+ else if (argument == optionEnableThreadedCompositing)
+ threadedCompositingEnabled = true;
else if (argument == optionEnableCompositeToTexture)
compositeToTexture = true;
else if (argument == optionForceCompositingMode)
@@ -224,6 +228,7 @@
TestShell shell(testShellMode);
shell.setAllowExternalPages(allowExternalPages);
shell.setAcceleratedCompositingEnabled(acceleratedCompositingEnabled);
+ shell.setThreadedCompositingEnabled(threadedCompositingEnabled);
shell.setCompositeToTexture(compositeToTexture);
shell.setForceCompositingMode(forceCompositingMode);
shell.setAccelerated2dCanvasEnabled(accelerated2DCanvasEnabled);
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.cpp (96789 => 96790)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2011-10-06 06:04:20 UTC (rev 96789)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2011-10-06 06:34:02 UTC (rev 96790)
@@ -104,6 +104,7 @@
, m_devTools(0)
, m_allowExternalPages(false)
, m_acceleratedCompositingEnabled(false)
+ , m_threadedCompositingEnabled(false)
, m_compositeToTexture(false)
, m_forceCompositingMode(false)
, m_accelerated2dCanvasEnabled(false)
@@ -192,6 +193,7 @@
{
m_prefs.reset();
m_prefs.acceleratedCompositingEnabled = m_acceleratedCompositingEnabled;
+ m_prefs.threadedCompositingEnabled = m_threadedCompositingEnabled;
m_prefs.compositeToTexture = m_compositeToTexture;
m_prefs.forceCompositingMode = m_forceCompositingMode;
m_prefs.accelerated2dCanvasEnabled = m_accelerated2dCanvasEnabled;
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.h (96789 => 96790)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.h 2011-10-06 06:04:20 UTC (rev 96789)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.h 2011-10-06 06:34:02 UTC (rev 96790)
@@ -129,6 +129,7 @@
void setAllowExternalPages(bool allowExternalPages) { m_allowExternalPages = allowExternalPages; }
void setAcceleratedCompositingEnabled(bool enabled) { m_acceleratedCompositingEnabled = enabled; }
+ void setThreadedCompositingEnabled(bool enabled) { m_threadedCompositingEnabled = enabled; }
void setCompositeToTexture(bool enabled) { m_compositeToTexture = enabled; }
void setForceCompositingMode(bool enabled) { m_forceCompositingMode = enabled; }
void setAccelerated2dCanvasEnabled(bool enabled) { m_accelerated2dCanvasEnabled = enabled; }
@@ -215,6 +216,7 @@
int m_timeout; // timeout value in millisecond
bool m_allowExternalPages;
bool m_acceleratedCompositingEnabled;
+ bool m_threadedCompositingEnabled;
bool m_compositeToTexture;
bool m_forceCompositingMode;
bool m_accelerated2dCanvasEnabled;
Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp (96789 => 96790)
--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2011-10-06 06:04:20 UTC (rev 96789)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2011-10-06 06:34:02 UTC (rev 96790)
@@ -108,6 +108,7 @@
tabsToLinks = false;
hyperlinkAuditingEnabled = false;
acceleratedCompositingEnabled = false;
+ threadedCompositingEnabled = false;
compositeToTexture = false;
accelerated2dCanvasEnabled = false;
legacyAccelerated2dCanvasEnabled = false;
@@ -162,6 +163,7 @@
webView->setTabsToLinks(tabsToLinks);
settings->setCaretBrowsingEnabled(caretBrowsingEnabled);
settings->setAcceleratedCompositingEnabled(acceleratedCompositingEnabled);
+ settings->setUseThreadedCompositor(threadedCompositingEnabled);
settings->setCompositeToTextureEnabled(compositeToTexture);
settings->setForceCompositingMode(forceCompositingMode);
settings->setAccelerated2dCanvasEnabled(accelerated2dCanvasEnabled);
Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.h (96789 => 96790)
--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.h 2011-10-06 06:04:20 UTC (rev 96789)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.h 2011-10-06 06:34:02 UTC (rev 96790)
@@ -81,6 +81,7 @@
bool hyperlinkAuditingEnabled;
bool caretBrowsingEnabled;
bool acceleratedCompositingEnabled;
+ bool threadedCompositingEnabled;
bool compositeToTexture;
bool forceCompositingMode;
bool accelerated2dCanvasEnabled;
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py (96789 => 96790)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-10-06 06:04:20 UTC (rev 96789)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-10-06 06:34:02 UTC (rev 96790)
@@ -421,6 +421,7 @@
'stress_opt': '--stress-opt',
'stress_deopt': '--stress-deopt',
'accelerated_compositing': '--enable-accelerated-compositing',
+ 'threaded_compositing': '--enable-threaded-compositing',
'accelerated_2d_canvas': '--enable-accelerated-2d-canvas',
'accelerated_drawing': '--enable-accelerated-drawing',
'enable_hardware_gpu': '----enable-hardware-gpu',
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (96789 => 96790)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2011-10-06 06:04:20 UTC (rev 96789)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2011-10-06 06:34:02 UTC (rev 96790)
@@ -219,6 +219,9 @@
action=""
dest="accelerated_compositing",
help="Don't use hardware-accelerated compositing for rendering"),
+ optparse.make_option("--threaded-compositing",
+ action=""
+ help="Use threaded compositing for rendering"),
optparse.make_option("--accelerated-2d-canvas",
action=""
help="Use hardware-accelerated 2D Canvas calls"),
