Diff
Modified: trunk/LayoutTests/ChangeLog (134485 => 134486)
--- trunk/LayoutTests/ChangeLog 2012-11-13 22:31:22 UTC (rev 134485)
+++ trunk/LayoutTests/ChangeLog 2012-11-13 22:32:00 UTC (rev 134486)
@@ -1,5 +1,16 @@
2012-11-13 Dimitri Glazkov <[email protected]>
+ Unreviewed, rolling out r134446.
+ http://trac.webkit.org/changeset/134446
+ https://bugs.webkit.org/show_bug.cgi?id=101968
+
+ Need to try a different strategy for landing a two-sided patch
+ (3/3).
+
+ * platform/chromium/TestExpectations:
+
+2012-11-13 Dimitri Glazkov <[email protected]>
+
Unreviewed, rolling out r134458.
http://trac.webkit.org/changeset/134458
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (134485 => 134486)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-11-13 22:31:22 UTC (rev 134485)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-11-13 22:32:00 UTC (rev 134486)
@@ -4174,37 +4174,6 @@
# This test is consistently leaking state into the next test (object-src-url-allowed.html) after r133069.
webkit.org/b/100955 http/tests/security/contentSecurityPolicy/object-src-none-blocked.html [ Skip ]
-webkit.org/b/101968 compositing/reflections/animation-inside-reflection.html [ Timeout ]
-webkit.org/b/101968 animations/animation-direction-reverse.html [ Timeout ]
-webkit.org/b/101968 animations/3d/matrix-transform-type-animation.html [ Timeout ]
-webkit.org/b/101968 animations/change-transform-style-during-animation.html [ Timeout ]
-webkit.org/b/101968 animations/3d/state-at-end-event-transform.html [ Timeout ]
-webkit.org/b/101968 animations/big-rotation.html [ Timeout ]
-webkit.org/b/101968 animations/additive-transform-animations.html [ Timeout ]
-webkit.org/b/101968 animations/3d/replace-filling-transform.html [ Timeout ]
-webkit.org/b/101968 animations/fill-mode-transform.html [ Timeout ]
-webkit.org/b/101968 compositing/animation/state-at-end-event-transform-layer.html [ Timeout ]
-webkit.org/b/101968 animations/animation-start-event-destroy-renderer.html [ Timeout ]
-webkit.org/b/101968 compositing/animation/animation-compositing.html [ Timeout ]
-webkit.org/b/101968 compositing/layer-creation/overlap-animation.html [ Timeout ]
-webkit.org/b/101968 animations/animation-hit-test-transform.html [ Timeout ]
-webkit.org/b/101968 animations/3d/change-transform-in-end-event.html [ Timeout ]
-webkit.org/b/101968 animations/animation-direction-reverse-hardware.html [ Timeout ]
-webkit.org/b/101968 animations/keyframe-timing-functions-transform.html [ Timeout ]
-webkit.org/b/101968 animations/animation-matrix-negative-scale-unmatrix.html [ Timeout ]
-webkit.org/b/101968 animations/missing-from-to-transforms.html [ Timeout ]
-webkit.org/b/101968 animations/3d/transform-perspective.html [ Timeout ]
-webkit.org/b/101968 animations/animation-end-event-destroy-renderer.html [ Timeout ]
-webkit.org/b/101968 animations/animation-direction-normal.html [ Timeout ]
-webkit.org/b/101968 animations/combo-transform-rotate+scale.html [ Timeout ]
-webkit.org/b/101968 animations/3d/transform-origin-vs-functions.html [ Timeout ]
-webkit.org/b/101968 animations/matrix-anim.html [ Timeout ]
-webkit.org/b/101968 animations/animation-iteration-event-destroy-renderer.html [ Timeout ]
-webkit.org/b/101968 animations/animation-direction-reverse-fill-mode-hardware.html [ Timeout ]
-webkit.org/b/101968 animations/dynamic-stylesheet-loading.html [ Timeout ]
-webkit.org/b/101968 animations/animation-direction-reverse-timing-functions-hardware.html [ Timeout ]
-webkit.org/b/101968 compositing/reflections/nested-reflection-animated.html [ Timeout ]
-
webkit.org/b/101377 [ Linux Debug ] platform/chromium-linux/fast/text/international/complex-joining-using-gpos.html [ Failure ImageOnlyFailure Pass ]
webkit.org/b/101408 platform/chromium/fast/forms/calendar-picker/calendar-picker-key-operations.html [ Failure Pass ]
Modified: trunk/Source/Platform/ChangeLog (134485 => 134486)
--- trunk/Source/Platform/ChangeLog 2012-11-13 22:31:22 UTC (rev 134485)
+++ trunk/Source/Platform/ChangeLog 2012-11-13 22:32:00 UTC (rev 134486)
@@ -1,3 +1,18 @@
+2012-11-13 Dimitri Glazkov <[email protected]>
+
+ Unreviewed, rolling out r134446.
+ http://trac.webkit.org/changeset/134446
+ https://bugs.webkit.org/show_bug.cgi?id=101968
+
+ Need to try a different strategy for landing a two-sided patch
+ (3/3).
+
+ * chromium/public/WebCompositorSupport.h:
+ (WebCompositorSupport):
+ * chromium/public/WebLayerTreeView.h:
+ (WebKit::WebLayerTreeView::Settings::Settings):
+ (Settings):
+
2012-11-12 Dana Jansens <[email protected]>
[chromium] Remove the WebCompositorSupport methods for changing settings, plumb everything through WebLayerTreeSettings
Modified: trunk/Source/Platform/chromium/public/WebCompositorSupport.h (134485 => 134486)
--- trunk/Source/Platform/chromium/public/WebCompositorSupport.h 2012-11-13 22:31:22 UTC (rev 134485)
+++ trunk/Source/Platform/chromium/public/WebCompositorSupport.h 2012-11-13 22:32:00 UTC (rev 134486)
@@ -68,7 +68,6 @@
virtual void shutdown() { }
// These may only be called before initialize.
- // FIXME: Remove these.
virtual void setPerTilePaintingEnabled(bool) { }
virtual void setPartialSwapEnabled(bool) { }
virtual void setAcceleratedAnimationEnabled(bool) { }
Modified: trunk/Source/Platform/chromium/public/WebLayerTreeView.h (134485 => 134486)
--- trunk/Source/Platform/chromium/public/WebLayerTreeView.h 2012-11-13 22:31:22 UTC (rev 134485)
+++ trunk/Source/Platform/chromium/public/WebLayerTreeView.h 2012-11-13 22:32:00 UTC (rev 134486)
@@ -52,10 +52,6 @@
, showPlatformLayerTree(false)
, showPaintRects(false)
, renderVSyncEnabled(true)
- , perTilePaintingEnabled(false)
- , partialSwapEnabled(false)
- , acceleratedAnimationEnabled(false)
- , pageScalePinchZoomEnabled(false)
, refreshRate(0)
, defaultTileSize(WebSize(256, 256))
, maxUntiledLayerSize(WebSize(512, 512))
@@ -67,10 +63,6 @@
bool showPlatformLayerTree;
bool showPaintRects;
bool renderVSyncEnabled;
- bool perTilePaintingEnabled;
- bool partialSwapEnabled;
- bool acceleratedAnimationEnabled;
- bool pageScalePinchZoomEnabled;
double refreshRate;
WebSize defaultTileSize;
WebSize maxUntiledLayerSize;
Modified: trunk/Source/WebKit/chromium/ChangeLog (134485 => 134486)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-11-13 22:31:22 UTC (rev 134485)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-11-13 22:32:00 UTC (rev 134486)
@@ -1,3 +1,22 @@
+2012-11-13 Dimitri Glazkov <[email protected]>
+
+ Unreviewed, rolling out r134446.
+ http://trac.webkit.org/changeset/134446
+ https://bugs.webkit.org/show_bug.cgi?id=101968
+
+ Need to try a different strategy for landing a two-sided patch
+ (3/3).
+
+ * public/WebSettings.h:
+ * src/WebSettingsImpl.cpp:
+ * src/WebSettingsImpl.h:
+ (WebSettingsImpl):
+ (WebKit::WebSettingsImpl::gestureTapHighlightEnabled):
+ (WebKit::WebSettingsImpl::doubleTapToZoomEnabled):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+ (WebKit):
+
2012-11-13 Dan Carney <[email protected]>
[V8] More efficient wrapper dispatch
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (134485 => 134486)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2012-11-13 22:31:22 UTC (rev 134485)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2012-11-13 22:32:00 UTC (rev 134486)
@@ -56,7 +56,6 @@
virtual bool scrollAnimatorEnabled() const = 0;
virtual bool viewportEnabled() const = 0;
virtual void setAccelerated2dCanvasEnabled(bool) = 0;
- virtual void setAcceleratedAnimationEnabled(bool) = 0;
virtual void setAcceleratedCompositingEnabled(bool) = 0;
virtual void setAcceleratedCompositingFor3DTransformsEnabled(bool) = 0;
virtual void setAcceleratedCompositingForAnimationEnabled(bool) = 0;
@@ -135,7 +134,6 @@
virtual void setPageCacheSupportsPlugins(bool) = 0;
virtual void setPasswordEchoDurationInSeconds(double) = 0;
virtual void setPasswordEchoEnabled(bool) = 0;
- virtual void setPerTilePaintingEnabled(bool) = 0;
virtual void setPictographFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
virtual void setPluginsEnabled(bool) = 0;
virtual void setPrivilegedWebGLExtensionsEnabled(bool) = 0;
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (134485 => 134486)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-11-13 22:31:22 UTC (rev 134485)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-11-13 22:32:00 UTC (rev 134486)
@@ -431,11 +431,6 @@
m_settings->setEditingBehaviorType(static_cast<WebCore::EditingBehaviorType>(behavior));
}
-void WebSettingsImpl::setAcceleratedAnimationEnabled(bool enabled)
-{
- m_acceleratedAnimationEnabled = enabled;
-}
-
void WebSettingsImpl::setAcceleratedCompositingEnabled(bool enabled)
{
m_settings->setAcceleratedCompositingEnabled(enabled);
@@ -591,11 +586,6 @@
m_settings->setPasswordEchoDurationInSeconds(durationInSeconds);
}
-void WebSettingsImpl::setPerTilePaintingEnabled(bool enabled)
-{
- m_perTilePaintingEnabled = enabled;
-}
-
void WebSettingsImpl::setShouldPrintBackgrounds(bool enabled)
{
m_settings->setShouldPrintBackgrounds(enabled);
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (134485 => 134486)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-11-13 22:31:22 UTC (rev 134485)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-11-13 22:32:00 UTC (rev 134486)
@@ -48,7 +48,6 @@
virtual bool scrollAnimatorEnabled() const;
virtual bool viewportEnabled() const { return m_viewportEnabled; }
virtual void setAccelerated2dCanvasEnabled(bool);
- virtual void setAcceleratedAnimationEnabled(bool);
virtual void setAcceleratedCompositingEnabled(bool);
virtual void setAcceleratedCompositingFor3DTransformsEnabled(bool);
virtual void setAcceleratedCompositingForAnimationEnabled(bool);
@@ -127,7 +126,6 @@
virtual void setPageCacheSupportsPlugins(bool);
virtual void setPasswordEchoDurationInSeconds(double);
virtual void setPasswordEchoEnabled(bool);
- virtual void setPerTilePaintingEnabled(bool);
virtual void setPictographFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
virtual void setPluginsEnabled(bool);
virtual void setPrivilegedWebGLExtensionsEnabled(bool);
@@ -170,10 +168,8 @@
bool applyDefaultDeviceScaleFactorInCompositor() const { return m_applyDefaultDeviceScaleFactorInCompositor; }
bool applyPageScaleFactorInCompositor() const;
bool autoZoomFocusedNodeToLegibleScale() const { return m_autoZoomFocusedNodeToLegibleScale; }
- bool gestureTapHighlightEnabled() const { return m_gestureTapHighlightEnabled; }
- bool doubleTapToZoomEnabled() const { return m_doubleTapToZoomEnabled; }
- bool perTilePaintingEnabled() const { return m_perTilePaintingEnabled; }
- bool acceleratedAnimationEnabled() const { return m_acceleratedAnimationEnabled; }
+ bool gestureTapHighlightEnabled() { return m_gestureTapHighlightEnabled; }
+ bool doubleTapToZoomEnabled() { return m_doubleTapToZoomEnabled; }
WebSize defaultTileSize() const { return m_defaultTileSize; }
WebSize maxUntiledLayerSize() const { return m_maxUntiledLayerSize; }
@@ -189,8 +185,6 @@
bool m_autoZoomFocusedNodeToLegibleScale;
bool m_deferredImageDecodingEnabled;
bool m_doubleTapToZoomEnabled;
- bool m_perTilePaintingEnabled;
- bool m_acceleratedAnimationEnabled;
WebSize m_defaultTileSize;
WebSize m_maxUntiledLayerSize;
};
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (134485 => 134486)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-11-13 22:31:22 UTC (rev 134485)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-11-13 22:32:00 UTC (rev 134486)
@@ -3968,9 +3968,6 @@
layerTreeViewSettings.showPlatformLayerTree = settingsImpl()->showPlatformLayerTree();
layerTreeViewSettings.showPaintRects = settingsImpl()->showPaintRects();
layerTreeViewSettings.renderVSyncEnabled = settingsImpl()->renderVSyncEnabled();
- layerTreeViewSettings.perTilePaintingEnabled = settingsImpl()->perTilePaintingEnabled();
- layerTreeViewSettings.acceleratedAnimationEnabled = settingsImpl()->acceleratedAnimationEnabled();
- layerTreeViewSettings.pageScalePinchZoomEnabled = settingsImpl()->applyPageScaleFactorInCompositor();
layerTreeViewSettings.defaultTileSize = settingsImpl()->defaultTileSize();
layerTreeViewSettings.maxUntiledLayerSize = settingsImpl()->maxUntiledLayerSize();
Modified: trunk/Tools/ChangeLog (134485 => 134486)
--- trunk/Tools/ChangeLog 2012-11-13 22:31:22 UTC (rev 134485)
+++ trunk/Tools/ChangeLog 2012-11-13 22:32:00 UTC (rev 134486)
@@ -1,5 +1,26 @@
2012-11-13 Dimitri Glazkov <[email protected]>
+ Unreviewed, rolling out r134446.
+ http://trac.webkit.org/changeset/134446
+ https://bugs.webkit.org/show_bug.cgi?id=101968
+
+ Need to try a different strategy for landing a two-sided patch
+ (3/3).
+
+ * DumpRenderTree/chromium/TestShell.cpp:
+ (TestShell::TestShell):
+ (TestShell::resetWebSettings):
+ (TestShell::setPerTilePaintingEnabled):
+ (TestShell::setAcceleratedAnimationEnabled):
+ * DumpRenderTree/chromium/TestShell.h:
+ (TestShell):
+ * DumpRenderTree/chromium/WebPreferences.cpp:
+ (WebPreferences::applyTo):
+ * DumpRenderTree/chromium/WebPreferences.h:
+ (WebPreferences):
+
+2012-11-13 Dimitri Glazkov <[email protected]>
+
Unreviewed, rolling out r134449.
http://trac.webkit.org/changeset/134449
https://bugs.webkit.org/show_bug.cgi?id=102076
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.cpp (134485 => 134486)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2012-11-13 22:31:22 UTC (rev 134485)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2012-11-13 22:32:00 UTC (rev 134486)
@@ -118,8 +118,6 @@
, m_accelerated2dCanvasEnabled(false)
, m_deferred2dCanvasEnabled(false)
, m_acceleratedPaintingEnabled(false)
- , m_perTilePaintingEnabled(false)
- , m_acceleratedAnimationEnabled(false)
, m_deferredImageDecodingEnabled(false)
, m_stressOpt(false)
, m_stressDeopt(false)
@@ -238,8 +236,6 @@
m_prefs.accelerated2dCanvasEnabled = m_accelerated2dCanvasEnabled;
m_prefs.deferred2dCanvasEnabled = m_deferred2dCanvasEnabled;
m_prefs.acceleratedPaintingEnabled = m_acceleratedPaintingEnabled;
- m_prefs.perTilePaintingEnabled = m_perTilePaintingEnabled;
- m_prefs.acceleratedAnimationEnabled = m_acceleratedAnimationEnabled;
m_prefs.deferredImageDecodingEnabled = m_deferredImageDecodingEnabled;
m_prefs.applyTo(&webView);
}
@@ -392,6 +388,16 @@
testFinished();
}
+void TestShell::setPerTilePaintingEnabled(bool enabled)
+{
+ Platform::current()->compositorSupport()->setPerTilePaintingEnabled(enabled);
+}
+
+void TestShell::setAcceleratedAnimationEnabled(bool enabled)
+{
+ Platform::current()->compositorSupport()->setAcceleratedAnimationEnabled(enabled);
+}
+
static string dumpDocumentText(WebFrame* frame)
{
// We use the document element's text instead of the body text here because
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.h (134485 => 134486)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.h 2012-11-13 22:31:22 UTC (rev 134485)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.h 2012-11-13 22:32:00 UTC (rev 134486)
@@ -136,8 +136,8 @@
void setAccelerated2dCanvasEnabled(bool enabled) { m_accelerated2dCanvasEnabled = enabled; }
void setDeferred2dCanvasEnabled(bool enabled) { m_deferred2dCanvasEnabled = enabled; }
void setAcceleratedPaintingEnabled(bool enabled) { m_acceleratedPaintingEnabled = enabled; }
- void setPerTilePaintingEnabled(bool enabled) { m_perTilePaintingEnabled = enabled; }
- void setAcceleratedAnimationEnabled(bool enabled) { m_acceleratedAnimationEnabled = enabled; }
+ void setPerTilePaintingEnabled(bool);
+ void setAcceleratedAnimationEnabled(bool);
void setDeferredImageDecodingEnabled(bool enabled) { m_deferredImageDecodingEnabled = enabled; }
#if defined(OS_WIN)
// Access to the finished event. Used by the static WatchDog thread.
@@ -237,7 +237,6 @@
bool m_deferred2dCanvasEnabled;
bool m_acceleratedPaintingEnabled;
bool m_perTilePaintingEnabled;
- bool m_acceleratedAnimationEnabled;
bool m_deferredImageDecodingEnabled;
WebPreferences m_prefs;
bool m_stressOpt;
Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp (134485 => 134486)
--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2012-11-13 22:31:22 UTC (rev 134485)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2012-11-13 22:32:00 UTC (rev 134486)
@@ -231,8 +231,6 @@
settings->setAccelerated2dCanvasEnabled(accelerated2dCanvasEnabled);
settings->setDeferred2dCanvasEnabled(deferred2dCanvasEnabled);
settings->setAcceleratedPaintingEnabled(acceleratedPaintingEnabled);
- settings->setPerTilePaintingEnabled(perTilePaintingEnabled);
- settings->setAcceleratedAnimationEnabled(acceleratedAnimationEnabled);
settings->setDeferredImageDecodingEnabled(deferredImageDecodingEnabled);
settings->setMediaPlaybackRequiresUserGesture(mediaPlaybackRequiresUserGesture);
settings->setMockScrollbarsEnabled(mockScrollbarsEnabled);
Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.h (134485 => 134486)
--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.h 2012-11-13 22:31:22 UTC (rev 134485)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.h 2012-11-13 22:32:00 UTC (rev 134486)
@@ -111,8 +111,6 @@
bool accelerated2dCanvasEnabled;
bool deferred2dCanvasEnabled;
bool acceleratedPaintingEnabled;
- bool perTilePaintingEnabled;
- bool acceleratedAnimationEnabled;
bool deferredImageDecodingEnabled;
bool mediaPlaybackRequiresUserGesture;
bool mockScrollbarsEnabled;
