Diff
Modified: trunk/LayoutTests/ChangeLog (100354 => 100355)
--- trunk/LayoutTests/ChangeLog 2011-11-15 23:54:51 UTC (rev 100354)
+++ trunk/LayoutTests/ChangeLog 2011-11-16 00:02:33 UTC (rev 100355)
@@ -1,3 +1,12 @@
+2011-11-15 James Robinson <[email protected]>
+
+ [chromium] Merge chromium-gpu layout test configurations into non-gpu versions
+ https://bugs.webkit.org/show_bug.cgi?id=72402
+
+ Reviewed by Dirk Pranke.
+
+ * platform/chromium/test_expectations.txt:
+
2011-11-15 Peter Kasting <[email protected]>
Mark a test as flakily failing.
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (100354 => 100355)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-11-15 23:54:51 UTC (rev 100354)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-11-16 00:02:33 UTC (rev 100355)
@@ -2732,7 +2732,7 @@
BUGWK53868 : fast/notifications/notifications-document-close-crash.html = PASS TEXT
-BUGWK54051 MAC : plugins/invalidate_rect.html = TEXT
+BUGWK54051 MAC : compositing/plugins/invalidate_rect.html = TEXT
BUGWK54051 MAC : plugins/windowless_plugin_paint_test.html = TIMEOUT
// Snow Leopard-only failures (generally just need updated pixel results)
@@ -3878,6 +3878,16 @@
BUG_SENORBLANCO GPU : fast/canvas/canvas-transforms-fillRect-shadow.html = TEXT
+// Will need baselines updated to take compositing into account when that is enabled by default.
+// See bug for details
+BUGWK72402 : fast/media/mq-transform-03.html = PASS FAIL
+BUGWK72402 : transitions/default-timing-function.html = PASS FAIL
+BUGWK72402 : animations/missing-values-first-keyframe.html = PASS FAIL
+BUGWK72402 : fast/repaint/block-selection-gap-in-composited-layer.html = PASS FAIL
+BUGWK72402 : fast/media/mq-transform-02.html = PASS FAIL
+BUGWK72402 : animations/opacity-transform-animation.html = PASS FAIL
+BUGWK72402 : animations/missing-values-last-keyframe.html = PASS FAIL
+
// Need to rebaseline on win and mac.
BUG_TONY MAC : css3/flexbox/repaint.html = PASS FAIL
BUG_TONY MAC : css3/flexbox/repaint-rtl-column.html = PASS FAIL
@@ -3927,4 +3937,4 @@
BUGWK72376 WIN : fast/forms/file/input-file-label.html = TEXT PASS
-BUGWK72434 : inspector/styles/svg-style.xhtml = TEXT PASS
\ No newline at end of file
+BUGWK72434 : inspector/styles/svg-style.xhtml = TEXT PASS
Modified: trunk/Tools/ChangeLog (100354 => 100355)
--- trunk/Tools/ChangeLog 2011-11-15 23:54:51 UTC (rev 100354)
+++ trunk/Tools/ChangeLog 2011-11-16 00:02:33 UTC (rev 100355)
@@ -1,3 +1,35 @@
+2011-11-15 James Robinson <[email protected]>
+
+ [chromium] Merge chromium-gpu layout test configurations into non-gpu versions
+ https://bugs.webkit.org/show_bug.cgi?id=72402
+
+ Reviewed by Dirk Pranke.
+
+ Allows the compositing layout tests to run in the normal layout test run. This sets the default compositing
+ triggers in DumpRenderTree to more closely match what we use in Chromium. There are two exceptions, canvas 2d
+ and video (media) are still controlled by an explicit trigger so that they are true when platform=chromium-gpu
+ and false otherwise, so that we can run the same set of tests in both configurations. This isn't necessary for
+ the normal compositing triggers since we currently run the compositing tests in only one configuration - with
+ compositing enabled.
+
+ Since the compositing tests are currently marked WONTFIX SKIP on non-GPU platforms in test_expectations.txt this
+ patch should not impact any tests.
+
+ * DumpRenderTree/chromium/DumpRenderTree.cpp:
+ (main):
+ * DumpRenderTree/chromium/TestShell.cpp:
+ (TestShell::TestShell):
+ (TestShell::resetWebSettings):
+ * DumpRenderTree/chromium/TestShell.h:
+ (TestShell::setAcceleratedCompositingForVideoEnabled):
+ * DumpRenderTree/chromium/WebPreferences.cpp:
+ (WebPreferences::reset):
+ (WebPreferences::applyTo):
+ * DumpRenderTree/chromium/WebPreferences.h:
+ * Scripts/webkitpy/layout_tests/port/chromium.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py:
+
2011-11-15 Tony Chang <[email protected]>
Unreviewed, try to fix ref tests failures on SL Intel bot.
Modified: trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp (100354 => 100355)
--- trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp 2011-11-15 23:54:51 UTC (rev 100354)
+++ trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp 2011-11-16 00:02:33 UTC (rev 100355)
@@ -53,7 +53,7 @@
static const char optionCheckLayoutTestSystemDeps[] = "--check-layout-test-sys-deps";
static const char optionHardwareAcceleratedGL[] = "--enable-hardware-gpu";
-static const char optionEnableAcceleratedCompositing[] = "--enable-accelerated-compositing";
+static const char optionEnableAcceleratedCompositingForVideo[] = "--enable-compositing-for-video";
static const char optionEnableThreadedCompositing[] = "--enable-threaded-compositing";
static const char optionForceCompositingMode[] = "--force-compositing-mode";
static const char optionEnableAccelerated2DCanvas[] = "--enable-accelerated-2d-canvas";
@@ -138,7 +138,7 @@
bool testShellMode = false;
bool allowExternalPages = false;
bool startupDialog = false;
- bool acceleratedCompositingEnabled = false;
+ bool acceleratedCompositingForVideoEnabled = false;
bool threadedCompositingEnabled = false;
bool compositeToTexture = false;
bool forceCompositingMode = false;
@@ -176,8 +176,8 @@
return checkLayoutTestSystemDependencies() ? EXIT_SUCCESS : EXIT_FAILURE;
else if (argument == optionHardwareAcceleratedGL)
hardwareAcceleratedGL = true;
- else if (argument == optionEnableAcceleratedCompositing)
- acceleratedCompositingEnabled = true;
+ else if (argument == optionEnableAcceleratedCompositingForVideo)
+ acceleratedCompositingForVideoEnabled = true;
else if (argument == optionEnableThreadedCompositing)
threadedCompositingEnabled = true;
else if (argument == optionEnableCompositeToTexture)
@@ -231,7 +231,7 @@
{ // Explicit scope for the TestShell instance.
TestShell shell(testShellMode);
shell.setAllowExternalPages(allowExternalPages);
- shell.setAcceleratedCompositingEnabled(acceleratedCompositingEnabled);
+ shell.setAcceleratedCompositingForVideoEnabled(acceleratedCompositingForVideoEnabled);
shell.setThreadedCompositingEnabled(threadedCompositingEnabled);
shell.setCompositeToTexture(compositeToTexture);
shell.setForceCompositingMode(forceCompositingMode);
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.cpp (100354 => 100355)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2011-11-15 23:54:51 UTC (rev 100354)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2011-11-16 00:02:33 UTC (rev 100355)
@@ -103,7 +103,7 @@
, m_testShellMode(testShellMode)
, m_devTools(0)
, m_allowExternalPages(false)
- , m_acceleratedCompositingEnabled(false)
+ , m_acceleratedCompositingForVideoEnabled(false)
, m_threadedCompositingEnabled(false)
, m_compositeToTexture(false)
, m_forceCompositingMode(false)
@@ -196,7 +196,8 @@
void TestShell::resetWebSettings(WebView& webView)
{
m_prefs.reset();
- m_prefs.acceleratedCompositingEnabled = m_acceleratedCompositingEnabled;
+ m_prefs.acceleratedCompositingEnabled = true;
+ m_prefs.acceleratedCompositingForVideoEnabled = m_acceleratedCompositingForVideoEnabled;
m_prefs.threadedCompositingEnabled = m_threadedCompositingEnabled;
m_prefs.compositeToTexture = m_compositeToTexture;
m_prefs.forceCompositingMode = m_forceCompositingMode;
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.h (100354 => 100355)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.h 2011-11-15 23:54:51 UTC (rev 100354)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.h 2011-11-16 00:02:33 UTC (rev 100355)
@@ -128,7 +128,7 @@
bool allowExternalPages() const { return m_allowExternalPages; }
void setAllowExternalPages(bool allowExternalPages) { m_allowExternalPages = allowExternalPages; }
- void setAcceleratedCompositingEnabled(bool enabled) { m_acceleratedCompositingEnabled = enabled; }
+ void setAcceleratedCompositingForVideoEnabled(bool enabled) { m_acceleratedCompositingForVideoEnabled = enabled; }
void setThreadedCompositingEnabled(bool enabled) { m_threadedCompositingEnabled = enabled; }
void setCompositeToTexture(bool enabled) { m_compositeToTexture = enabled; }
void setForceCompositingMode(bool enabled) { m_forceCompositingMode = enabled; }
@@ -215,7 +215,7 @@
TestParams m_params;
int m_timeout; // timeout value in millisecond
bool m_allowExternalPages;
- bool m_acceleratedCompositingEnabled;
+ bool m_acceleratedCompositingForVideoEnabled;
bool m_threadedCompositingEnabled;
bool m_compositeToTexture;
bool m_forceCompositingMode;
Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp (100354 => 100355)
--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2011-11-15 23:54:51 UTC (rev 100354)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2011-11-16 00:02:33 UTC (rev 100355)
@@ -107,6 +107,7 @@
tabsToLinks = false;
hyperlinkAuditingEnabled = false;
+ acceleratedCompositingForVideoEnabled = false;
acceleratedCompositingEnabled = false;
threadedCompositingEnabled = false;
compositeToTexture = false;
@@ -211,6 +212,7 @@
webView->setTabsToLinks(tabsToLinks);
settings->setCaretBrowsingEnabled(caretBrowsingEnabled);
settings->setAcceleratedCompositingEnabled(acceleratedCompositingEnabled);
+ settings->setAcceleratedCompositingForVideoEnabled(acceleratedCompositingForVideoEnabled);
settings->setUseThreadedCompositor(threadedCompositingEnabled);
settings->setCompositeToTextureEnabled(compositeToTexture);
settings->setForceCompositingMode(forceCompositingMode);
Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.h (100354 => 100355)
--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.h 2011-11-15 23:54:51 UTC (rev 100354)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.h 2011-11-16 00:02:33 UTC (rev 100355)
@@ -100,6 +100,7 @@
bool tabsToLinks;
bool hyperlinkAuditingEnabled;
bool caretBrowsingEnabled;
+ bool acceleratedCompositingForVideoEnabled;
bool acceleratedCompositingEnabled;
bool threadedCompositingEnabled;
bool compositeToTexture;
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py (100354 => 100355)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-11-15 23:54:51 UTC (rev 100354)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-11-16 00:02:33 UTC (rev 100355)
@@ -425,10 +425,10 @@
'gp_fault_error_box': '--gp-fault-error-box',
'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',
+ 'accelerated_video': '--enable-accelerated-video',
'enable_hardware_gpu': '--enable-hardware-gpu',
}
for nrwt_option, drt_option in option_mappings.items():
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py (100354 => 100355)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py 2011-11-15 23:54:51 UTC (rev 100354)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py 2011-11-16 00:02:33 UTC (rev 100355)
@@ -63,10 +63,10 @@
def _set_gpu_options(port, graphics_type='gpu'):
port._graphics_type = graphics_type
- if port.get_option('accelerated_compositing') is None:
- port._options.accelerated_compositing = True
if port.get_option('accelerated_2d_canvas') is None:
port._options.accelerated_2d_canvas = True
+ if port.get_option('accelerated_video') is None:
+ port._options.accelerated_video = True
if port.get_option('experimental_fully_parallel') is None:
port._options.experimental_fully_parallel = True
@@ -78,8 +78,7 @@
def _tests(port, paths):
if not paths:
- paths = ['compositing', 'platform/chromium/compositing', 'animations/3d']
-
+ paths = []
if (port.name() != 'chromium-gpu-mac-leopard' and
port.name() != 'chromium-gpu-cg-mac-leopard'):
# Only run tests requiring accelerated compositing on platforms that
@@ -92,9 +91,7 @@
# Canvas is not yet accelerated on the Mac, so there's no point
# in running the tests there.
paths += ['fast/canvas', 'canvas/philip']
- # invalidate_rect.html tests a bug in the compositor.
- # See https://bugs.webkit.org/show_bug.cgi?id=53117
- paths += ['plugins/invalidate_rect.html']
+
return set([port.relative_test_filename(f) for f in test_files.find(port, paths)])
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py (100354 => 100355)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py 2011-11-15 23:54:51 UTC (rev 100354)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py 2011-11-16 00:02:33 UTC (rev 100355)
@@ -56,16 +56,16 @@
host.filesystem = FileSystem() # FIXME: This test should not use a real filesystem!
# test that we got the right port
- mock_options = MockOptions(accelerated_compositing=None,
- accelerated_2d_canvas=None,
- builder_name='foo',
- child_processes=None)
+ mock_options = MockOptions(accelerated_2d_canvas=None,
+ accelerated_video=None,
+ builder_name='foo',
+ child_processes=None)
if input_name and platform:
port = chromium_gpu.get(host, platform=platform, port_name=input_name, options=mock_options)
else:
port = chromium_gpu.get(host, port_name=port_name, options=mock_options)
- self.assertTrue(port._options.accelerated_compositing)
self.assertTrue(port._options.accelerated_2d_canvas)
+ self.assertTrue(port._options.accelerated_video)
self.assertTrue(port._options.experimental_fully_parallel)
self.assertEqual(port._options.builder_name, 'foo - GPU')
@@ -87,10 +87,6 @@
# Note that this is using a real filesystem.
files = port.tests(None)
- path = 'compositing/checkerboard.html'
- self.assertTrue(port._filesystem.exists(port.abspath_for_test(path)))
- self.assertTrue(path in files)
-
path = 'fast/html/keygen.html'
self.assertTrue(port._filesystem.exists(port.abspath_for_test(path)))
self.assertFalse(path in files)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (100354 => 100355)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2011-11-15 23:54:51 UTC (rev 100354)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2011-11-16 00:02:33 UTC (rev 100355)
@@ -217,13 +217,13 @@
optparse.make_option("--nocheck-sys-deps", action=""
default=False,
help="Don't check the system dependencies (themes)"),
- optparse.make_option("--accelerated-compositing",
+ optparse.make_option("--accelerated-video",
action=""
- help="Use hardware-accelerated compositing for rendering"),
- optparse.make_option("--no-accelerated-compositing",
+ help="Use hardware-accelerated compositing for video"),
+ optparse.make_option("--no-accelerated-video",
action=""
- dest="accelerated_compositing",
- help="Don't use hardware-accelerated compositing for rendering"),
+ dest="accelerated_video",
+ help="Don't use hardware-accelerated compositing for video"),
optparse.make_option("--threaded-compositing",
action=""
help="Use threaded compositing for rendering"),
