Diff
Modified: trunk/LayoutTests/ChangeLog (137709 => 137710)
--- trunk/LayoutTests/ChangeLog 2012-12-14 04:41:58 UTC (rev 137709)
+++ trunk/LayoutTests/ChangeLog 2012-12-14 04:48:11 UTC (rev 137710)
@@ -1,3 +1,15 @@
+2012-12-13 Ian Vollick <[email protected]>
+
+ [chromium] Add a virtual test suite for enabling opt-in to composited scrolling
+ https://bugs.webkit.org/show_bug.cgi?id=104911
+
+ Reviewed by Dirk Pranke.
+
+ Updated the test expectations for the virtual test suite to match the
+ usual chromium test expectations.
+
+ * platform/chromium/TestExpectations:
+
2012-12-13 Takashi Sakamoto <[email protected]>
[Shadow DOM]: scoped styles are not applied in the cascade order.
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (137709 => 137710)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-12-14 04:41:58 UTC (rev 137709)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-12-14 04:48:11 UTC (rev 137710)
@@ -3626,8 +3626,11 @@
webkit.org/b/85856 [ Win Mac Android ] fast/block/float/026.html [ ImageOnlyFailure ]
webkit.org/b/85856 [ Win Mac Android ] fast/overflow/unreachable-overflow-rtl-bug.html [ Failure ImageOnlyFailure ]
webkit.org/b/85856 [ Linux Win SnowLeopard ] scrollbars/rtl/div-absolute.html [ Failure ]
+webkit.org/b/85856 [ Linux Win SnowLeopard ] platform/chromium/virtual/gpu/compositedscrolling/scrollbars/rtl/div-absolute.html [ Failure ]
webkit.org/b/85856 [ Lion MountainLion ] scrollbars/rtl/div-absolute.html [ Failure Pass ]
+webkit.org/b/85856 [ Lion MountainLion ] platform/chromium/virtual/gpu/compositedscrolling/scrollbars/rtl/div-absolute.html [ Failure Pass ]
webkit.org/b/85856 scrollbars/rtl/div-horizontal.html [ Failure ]
+webkit.org/b/85856 platform/chromium/virtual/gpu/compositedscrolling/scrollbars/rtl/div-horizontal.html [ Failure ]
# Bug 93148 changed this to a testRunner test and it started timing out on Mac.
webkit.org/b/93148 [ Mac ] fast/css/nested-layers-with-hover.html [ Timeout ]
@@ -3693,20 +3696,26 @@
# ENABLE_ACCELERATED_OVERFLOW_SCROLLING is not currently enabled in Chromium.
webkit.org/b/94353 compositing/overflow/scrolling-content-clip-to-viewport.html [ Failure ]
webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/scrolling-content-clip-to-viewport.html [ Failure ]
+webkit.org/b/94353 platform/chromium/virtual/gpu/compositedscrolling/overflow/scrolling-content-clip-to-viewport.html [ Failure ]
webkit.org/b/94353 compositing/overflow/scrolling-without-painting.html [ Failure ]
webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/scrolling-without-painting.html [ Failure ]
+webkit.org/b/94353 platform/chromium/virtual/gpu/compositedscrolling/overflow/scrolling-without-painting.html [ Failure ]
webkit.org/b/94353 compositing/overflow/updating-scrolling-content.html [ Failure ]
webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/updating-scrolling-content.html [ Failure ]
+webkit.org/b/94353 platform/chromium/virtual/gpu/compositedscrolling/overflow/updating-scrolling-content.html [ Failure ]
webkit.org/b/94353 compositing/overflow/textarea-scroll-touch.html [ Failure ]
webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/textarea-scroll-touch.html [ Failure ]
+webkit.org/b/94353 platform/chromium/virtual/gpu/compositedscrolling/overflow/textarea-scroll-touch.html [ Failure ]
# Failing on Linux (Content Shell) only now
webkit.org/b/94353 [ Android Linux ] compositing/overflow/nested-scrolling.html [ Failure Pass ]
webkit.org/b/94353 [ Android Linux ] platform/chromium/virtual/softwarecompositing/overflow/nested-scrolling.html [ Failure Pass ]
webkit.org/b/94353 compositing/overflow/overflow-auto-with-touch.html [ Failure ]
webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/overflow-auto-with-touch.html [ Failure ]
+webkit.org/b/94353 platform/chromium/virtual/gpu/compositedscrolling/overflow/overflow-auto-with-touch.html [ Failure ]
webkit.org/b/94353 compositing/overflow/overflow-overlay-with-touch.html [ Failure ]
webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/overflow-overlay-with-touch.html [ Failure ]
+webkit.org/b/94353 platform/chromium/virtual/gpu/compositedscrolling/overflow/overflow-overlay-with-touch.html [ Failure ]
webkit.org/b/90488 [ Win ] http/tests/inspector/network-preflight-options.html [ Pass Slow ]
Modified: trunk/Tools/ChangeLog (137709 => 137710)
--- trunk/Tools/ChangeLog 2012-12-14 04:41:58 UTC (rev 137709)
+++ trunk/Tools/ChangeLog 2012-12-14 04:48:11 UTC (rev 137710)
@@ -1,3 +1,31 @@
+2012-12-13 Ian Vollick <[email protected]>
+
+ [chromium] Add a virtual test suite for enabling opt-in to composited scrolling
+ https://bugs.webkit.org/show_bug.cgi?id=104911
+
+ Reviewed by Dirk Pranke.
+
+ Adds two virtual tests suites to run the tests in
+ compositing/overflow/ and scrollbars/ with the flag
+ --enable-accelerated-overflow-scroll, which I've also plumbed through
+ in the usual way.
+
+ * DumpRenderTree/chromium/DumpRenderTree.cpp:
+ (main):
+ * DumpRenderTree/chromium/TestRunner/public/WebPreferences.h:
+ (WebPreferences):
+ * DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp:
+ (WebTestRunner::WebPreferences::reset):
+ (WebTestRunner::WebPreferences::applyTo):
+ * DumpRenderTree/chromium/TestShell.cpp:
+ (TestShell::TestShell):
+ (TestShell::resetWebSettings):
+ * DumpRenderTree/chromium/TestShell.h:
+ (TestShell::setAcceleratedCompositingForOverflowScrollEnabled):
+ (TestShell):
+ * Scripts/webkitpy/layout_tests/port/chromium.py:
+ (ChromiumPort.virtual_test_suites):
+
2012-12-13 Eric Seidel <[email protected]>
Use 'perf' to profile on linux instead of google-pprof by default
Modified: trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp (137709 => 137710)
--- trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp 2012-12-14 04:41:58 UTC (rev 137709)
+++ trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp 2012-12-14 04:48:11 UTC (rev 137710)
@@ -63,6 +63,7 @@
static const char optionEnableAcceleratedPainting[] = "--enable-accelerated-painting";
static const char optionEnableAcceleratedCompositingForVideo[] = "--enable-accelerated-video";
static const char optionEnableAcceleratedFixedPosition[] = "--enable-accelerated-fixed-position";
+static const char optionEnableAcceleratedOverflowScroll[] = "--enable-accelerated-overflow-scroll";
static const char optionUseGraphicsContext3DImplementation[] = "--use-graphics-context-3d-implementation=";
static const char optionEnablePerTilePainting[] = "--enable-per-tile-painting";
static const char optionEnableDeferredImageDecoding[] = "--enable-deferred-image-decoding";
@@ -129,6 +130,7 @@
bool startupDialog = false;
bool acceleratedCompositingForVideoEnabled = false;
bool acceleratedCompositingForFixedPositionEnabled = false;
+ bool acceleratedCompositingForOverflowScrollEnabled = false;
bool softwareCompositingEnabled = false;
bool threadedCompositingEnabled = false;
bool forceCompositingMode = false;
@@ -168,6 +170,8 @@
acceleratedCompositingForVideoEnabled = true;
else if (argument == optionEnableAcceleratedFixedPosition)
acceleratedCompositingForFixedPositionEnabled = true;
+ else if (argument == optionEnableAcceleratedOverflowScroll)
+ acceleratedCompositingForOverflowScrollEnabled = true;
else if (argument == optionEnableSoftwareCompositing)
softwareCompositingEnabled = true;
else if (argument == optionEnableThreadedCompositing)
@@ -225,6 +229,7 @@
shell.setAllowExternalPages(allowExternalPages);
shell.setAcceleratedCompositingForVideoEnabled(acceleratedCompositingForVideoEnabled);
shell.setAcceleratedCompositingForFixedPositionEnabled(acceleratedCompositingForFixedPositionEnabled);
+ shell.setAcceleratedCompositingForOverflowScrollEnabled(acceleratedCompositingForOverflowScrollEnabled);
shell.setSoftwareCompositingEnabled(softwareCompositingEnabled);
shell.setThreadedCompositingEnabled(threadedCompositingEnabled);
shell.setForceCompositingMode(forceCompositingMode);
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebPreferences.h (137709 => 137710)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebPreferences.h 2012-12-14 04:41:58 UTC (rev 137709)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebPreferences.h 2012-12-14 04:48:11 UTC (rev 137710)
@@ -98,6 +98,7 @@
bool caretBrowsingEnabled;
bool acceleratedCompositingForVideoEnabled;
bool acceleratedCompositingForFixedPositionEnabled;
+ bool acceleratedCompositingForOverflowScrollEnabled;
bool acceleratedCompositingEnabled;
bool forceCompositingMode;
bool accelerated2dCanvasEnabled;
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp (137709 => 137710)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp 2012-12-14 04:41:58 UTC (rev 137709)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp 2012-12-14 04:48:11 UTC (rev 137710)
@@ -161,6 +161,7 @@
hyperlinkAuditingEnabled = false;
acceleratedCompositingForVideoEnabled = false;
acceleratedCompositingForFixedPositionEnabled = false;
+ acceleratedCompositingForOverflowScrollEnabled = false;
acceleratedCompositingEnabled = false;
accelerated2dCanvasEnabled = false;
deferred2dCanvasEnabled = false;
@@ -235,6 +236,7 @@
settings->setAcceleratedCompositingEnabled(acceleratedCompositingEnabled);
settings->setAcceleratedCompositingForVideoEnabled(acceleratedCompositingForVideoEnabled);
settings->setAcceleratedCompositingForFixedPositionEnabled(acceleratedCompositingForFixedPositionEnabled);
+ settings->setAcceleratedCompositingForOverflowScrollEnabled(acceleratedCompositingForOverflowScrollEnabled);
settings->setFixedPositionCreatesStackingContext(acceleratedCompositingForFixedPositionEnabled);
settings->setForceCompositingMode(forceCompositingMode);
settings->setAccelerated2dCanvasEnabled(accelerated2dCanvasEnabled);
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.cpp (137709 => 137710)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2012-12-14 04:41:58 UTC (rev 137709)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2012-12-14 04:48:11 UTC (rev 137710)
@@ -112,6 +112,7 @@
, m_allowExternalPages(false)
, m_acceleratedCompositingForVideoEnabled(false)
, m_acceleratedCompositingForFixedPositionEnabled(false)
+ , m_acceleratedCompositingForOverflowScrollEnabled(false)
, m_softwareCompositingEnabled(false)
, m_threadedCompositingEnabled(false)
, m_forceCompositingMode(false)
@@ -238,6 +239,7 @@
m_prefs.acceleratedCompositingEnabled = true;
m_prefs.acceleratedCompositingForVideoEnabled = m_acceleratedCompositingForVideoEnabled;
m_prefs.acceleratedCompositingForFixedPositionEnabled = m_acceleratedCompositingForFixedPositionEnabled;
+ m_prefs.acceleratedCompositingForOverflowScrollEnabled = m_acceleratedCompositingForOverflowScrollEnabled;
m_prefs.forceCompositingMode = m_forceCompositingMode;
m_prefs.accelerated2dCanvasEnabled = m_accelerated2dCanvasEnabled;
m_prefs.deferred2dCanvasEnabled = m_deferred2dCanvasEnabled;
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.h (137709 => 137710)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.h 2012-12-14 04:41:58 UTC (rev 137709)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.h 2012-12-14 04:48:11 UTC (rev 137710)
@@ -130,6 +130,7 @@
void setAcceleratedCompositingForVideoEnabled(bool enabled) { m_acceleratedCompositingForVideoEnabled = enabled; }
void setAcceleratedCompositingForFixedPositionEnabled(bool enabled) { m_acceleratedCompositingForFixedPositionEnabled = enabled; }
+ void setAcceleratedCompositingForOverflowScrollEnabled(bool enabled) { m_acceleratedCompositingForOverflowScrollEnabled = enabled; }
bool softwareCompositingEnabled() { return m_softwareCompositingEnabled; }
void setSoftwareCompositingEnabled(bool enabled) { m_softwareCompositingEnabled = enabled; }
void setThreadedCompositingEnabled(bool enabled) { m_threadedCompositingEnabled = enabled; }
@@ -232,6 +233,7 @@
bool m_allowExternalPages;
bool m_acceleratedCompositingForVideoEnabled;
bool m_acceleratedCompositingForFixedPositionEnabled;
+ bool m_acceleratedCompositingForOverflowScrollEnabled;
bool m_softwareCompositingEnabled;
bool m_threadedCompositingEnabled;
bool m_forceCompositingMode;
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py (137709 => 137710)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2012-12-14 04:41:58 UTC (rev 137709)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2012-12-14 04:48:11 UTC (rev 137710)
@@ -391,6 +391,12 @@
VirtualTestSuite('platform/chromium/virtual/deferred/fast/images',
'fast/images',
['--enable-deferred-image-decoding', '--enable-per-tile-painting', '--force-compositing-mode']),
+ VirtualTestSuite('platform/chromium/virtual/gpu/compositedscrolling/overflow',
+ 'compositing/overflow',
+ ['--enable-accelerated-overflow-scroll']),
+ VirtualTestSuite('platform/chromium/virtual/gpu/compositedscrolling/scrollbars',
+ 'scrollbars',
+ ['--enable-accelerated-overflow-scroll']),
]
#
