[chromium] Remove the WebCompositorSupport methods for changing settings, plumb everything through WebLayerTreeSettings https://bugs.webkit.org/show_bug.cgi?id=101968 Reviewed by James Robinson. Source/Platform: Move the outlier settings from WebCompositorSupport to WebLayerTreeView. PerTilePainting and AcceleratedAnimations are simply moved over. The PartialSwap and PageScalePinchZoomInCompositor settings, however, are not used by DRT, so we remove them. This change will temporarily break the --per-tile-painting and --accelerated-animations command line flags for chromium DRT until a chromium side patch hooks up the WebLayerTreeSettings again, but we have no bots running with these flags. PinchZoom will be unaffected by this, as DRT never turned it on, and by passing the WebLayerTreeSetting, chromium will not use it from here yet, either. PartialSwap will be also unaffected, as there was no place in WebKit that would enable it currently. * chromium/public/WebCompositorSupport.h: (WebCompositorSupport): * chromium/public/WebLayerTreeView.h: (WebKit::WebLayerTreeView::Settings::Settings): (Settings): Source/WebKit/chromium: This adds perTilePainting and acceleratedAniamtions to the WebSettings classes, so that DRT can turn these on via WebLayerTreeSettings. * public/WebSettings.h: * src/WebSettingsImpl.cpp: (WebKit::WebSettingsImpl::setAcceleratedAnimationEnabled): (WebKit): (WebKit::WebSettingsImpl::setPerTilePaintingEnabled): * src/WebSettingsImpl.h: (WebSettingsImpl): (WebKit::WebSettingsImpl::gestureTapHighlightEnabled): (WebKit::WebSettingsImpl::doubleTapToZoomEnabled): (WebKit::WebSettingsImpl::perTilePaintingEnabled): (WebKit::WebSettingsImpl::acceleratedAnimationEnabled): * src/WebViewImpl.cpp: (WebKit::WebViewImpl::setIsAcceleratedCompositingActive): (WebKit): Tools: * DumpRenderTree/chromium/TestShell.cpp: (TestShell::TestShell): (TestShell::resetWebSettings): * DumpRenderTree/chromium/TestShell.h: (TestShell::setPerTilePaintingEnabled): (TestShell::setAcceleratedAnimationEnabled): (TestShell): * DumpRenderTree/chromium/WebPreferences.cpp: (WebPreferences::applyTo): * DumpRenderTree/chromium/WebPreferences.h: (WebPreferences): git-svn-id: https://svn.webkit.org/repository/webkit/trunk/Source/Platform/chromium/public@134446 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCompositorSupport.h b/WebCompositorSupport.h index 1e4c6e2..b145343 100644 --- a/WebCompositorSupport.h +++ b/WebCompositorSupport.h
@@ -68,6 +68,7 @@ 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) { }
diff --git a/WebLayerTreeView.h b/WebLayerTreeView.h index 345045a..01c789c 100644 --- a/WebLayerTreeView.h +++ b/WebLayerTreeView.h
@@ -52,6 +52,10 @@ , showPlatformLayerTree(false) , showPaintRects(false) , renderVSyncEnabled(true) + , perTilePaintingEnabled(false) + , partialSwapEnabled(false) + , acceleratedAnimationEnabled(false) + , pageScalePinchZoomEnabled(false) , refreshRate(0) , defaultTileSize(WebSize(256, 256)) , maxUntiledLayerSize(WebSize(512, 512)) @@ -63,6 +67,10 @@ bool showPlatformLayerTree; bool showPaintRects; bool renderVSyncEnabled; + bool perTilePaintingEnabled; + bool partialSwapEnabled; + bool acceleratedAnimationEnabled; + bool pageScalePinchZoomEnabled; double refreshRate; WebSize defaultTileSize; WebSize maxUntiledLayerSize;