[chromium] Remove compositor settings that don't go through WebKit
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 19 Mar 2013 19:55:14 +0000 (19:55 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 19 Mar 2013 19:55:14 +0000 (19:55 +0000)
https://bugs.webkit.org/show_bug.cgi?id=112718

Patch by James Robinson <jamesr@chromium.org> on 2013-03-19
Reviewed by Adam Barth.

Source/WebKit/chromium:

This removes settings that used to propagate through WebLayerTreeView::Settings by way of WebViewImpl but are
now directly set by the embedder.

* public/WebSettings.h:
* src/WebSettingsImpl.cpp:
(WebKit::WebSettingsImpl::WebSettingsImpl):
* src/WebSettingsImpl.h:
(WebSettingsImpl):

Tools:

* DumpRenderTree/chromium/DumpRenderTree.cpp:
(main):
* DumpRenderTree/chromium/TestRunner/public/WebPreferences.h:
* 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):

LayoutTests:

* platform/chromium/compositing/accelerated-drawing/alpha-expected.png: Removed.
* platform/chromium/compositing/accelerated-drawing/alpha-expected.txt: Removed.
* platform/chromium/compositing/accelerated-drawing/alpha.html: Removed.
* platform/chromium/compositing/accelerated-drawing/svg-filters.html: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@146240 268f45cc-cd09-0410-ab3c-d52691b4dbfc

15 files changed:
LayoutTests/ChangeLog
LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha-expected.png [deleted file]
LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha-expected.txt [deleted file]
LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha.html [deleted file]
LayoutTests/platform/chromium/compositing/accelerated-drawing/svg-filters.html [deleted file]
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/public/WebSettings.h
Source/WebKit/chromium/src/WebSettingsImpl.cpp
Source/WebKit/chromium/src/WebSettingsImpl.h
Tools/ChangeLog
Tools/DumpRenderTree/chromium/DumpRenderTree.cpp
Tools/DumpRenderTree/chromium/TestRunner/public/WebPreferences.h
Tools/DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp
Tools/DumpRenderTree/chromium/TestShell.cpp
Tools/DumpRenderTree/chromium/TestShell.h

index e3d8c38..a79079e 100644 (file)
@@ -1,3 +1,15 @@
+2013-03-19  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Remove compositor settings that don't go through WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=112718
+
+        Reviewed by Adam Barth.
+
+        * platform/chromium/compositing/accelerated-drawing/alpha-expected.png: Removed.
+        * platform/chromium/compositing/accelerated-drawing/alpha-expected.txt: Removed.
+        * platform/chromium/compositing/accelerated-drawing/alpha.html: Removed.
+        * platform/chromium/compositing/accelerated-drawing/svg-filters.html: Removed.
+
 2013-03-19  Roger Fong  <roger_fong@apple.com>
 
         Unreviewed gardening of AppleWin port.
diff --git a/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha-expected.png b/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha-expected.png
deleted file mode 100644 (file)
index 40f9ccb..0000000
Binary files a/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha-expected.txt b/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha-expected.txt
deleted file mode 100644 (file)
index 8b13789..0000000
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha.html b/LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha.html
deleted file mode 100644 (file)
index 4b58c35..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-  .box {
-    width: 150px;
-    height: 150px;
-    margin: 10px;
-  }
-  #test {
-    -webkit-transform: translateZ(0);
-    background-color: rgb(0,255,0);
-    opacity: 0.4;
-  }
-  #ref {
-    background-color: rgb(153,255,153);
-  }
-</style>
-<script type="text/javascript">
-  if (window.testRunner)
-    testRunner.dumpAsText(true); // This is only useful as pixel test.
-
-  if (window.internals)
-    window.internals.settings.setAcceleratedDrawingEnabled(true);
-</script>
-</head>
-
-<body>
-<!-- You should see two squares of the same color -->
-<div id="test" class="box"></div>
-<div id="ref" class="box"></div>
-</body>
-</html>
diff --git a/LayoutTests/platform/chromium/compositing/accelerated-drawing/svg-filters.html b/LayoutTests/platform/chromium/compositing/accelerated-drawing/svg-filters.html
deleted file mode 100644 (file)
index 9e5b6c6..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script type="text/javascript">
-  if (window.testRunner)
-    testRunner.dumpAsText(true); // This is only useful as pixel test.
-
-  if (window.internals)
-    window.internals.settings.setAcceleratedDrawingEnabled(true);
-</script>
-</head>
-
-<body>
-<div style="-webkit-transform: translateZ(0);">
-  <svg xmlns="http://www.w3.org/2000/svg" version="1.1" height=500>
-    <defs>
-      <filter id="f1">
-        <feOffset in="SourceGraphic" x="50"/>
-      </filter>
-    </defs>
-    <rect width="300" height="300" filter="url(#f1)" style="fill:green"/>
-  </svg>
-</div>
-</body>
-</html>
index 7d906c7..88278e8 100644 (file)
@@ -1,3 +1,19 @@
+2013-03-19  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Remove compositor settings that don't go through WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=112718
+
+        Reviewed by Adam Barth.
+
+        This removes settings that used to propagate through WebLayerTreeView::Settings by way of WebViewImpl but are
+        now directly set by the embedder.
+
+        * public/WebSettings.h:
+        * src/WebSettingsImpl.cpp:
+        (WebKit::WebSettingsImpl::WebSettingsImpl):
+        * src/WebSettingsImpl.h:
+        (WebSettingsImpl):
+
 2013-03-19  Alpha Lam  <hclam@chromium.org>
 
         GIFImageReader to count frames and decode in one pass
index 3e5bf11..e92b6c8 100644 (file)
@@ -55,7 +55,6 @@ public:
     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;
@@ -66,7 +65,6 @@ public:
     virtual void setAcceleratedCompositingForScrollableFramesEnabled(bool) = 0;
     virtual void setAcceleratedCompositingForVideoEnabled(bool) = 0;
     virtual void setAcceleratedFiltersEnabled(bool) = 0;
-    virtual void setAcceleratedPaintingEnabled(bool) = 0;
     virtual void setAllowDisplayOfInsecureContent(bool) = 0;
     virtual void setAllowFileAccessFromFileURLs(bool) = 0;
     virtual void setAllowCustomScrollbarInMainFrame(bool) = 0;
@@ -88,7 +86,6 @@ public:
     virtual void setDefaultFixedFontSize(int) = 0;
     virtual void setDefaultFontSize(int) = 0;
     virtual void setDefaultTextEncodingName(const WebString&) = 0;
-    virtual void setDefaultTileSize(WebSize) = 0;
     virtual void setDefaultVideoPosterURL(const WebString&) = 0;
     virtual void setDeferred2dCanvasEnabled(bool) = 0;
     virtual void setDeferredImageDecodingEnabled(bool) = 0;
@@ -126,7 +123,6 @@ public:
     virtual void setLayoutFallbackWidth(int) = 0;
     virtual void setLoadsImagesAutomatically(bool) = 0;
     virtual void setLocalStorageEnabled(bool) = 0;
-    virtual void setMaxUntiledLayerSize(WebSize) = 0;
     virtual void setMediaPlaybackRequiresUserGesture(bool) = 0;
     virtual void setMemoryInfoEnabled(bool) = 0;
     virtual void setMinimumAccelerated2dCanvasSize(int) = 0;
@@ -144,8 +140,6 @@ public:
     virtual void setPictographFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
     virtual void setPluginsEnabled(bool) = 0;
     virtual void setPrivilegedWebGLExtensionsEnabled(bool) = 0;
-    virtual void setRecordRenderingStats(bool) = 0;
-    virtual void setRenderVSyncEnabled(bool) = 0;
     virtual void setRenderVSyncNotificationEnabled(bool) = 0;
     virtual void setSansSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
     virtual void setSelectTrailingWhitespaceEnabled(bool) = 0;
@@ -155,7 +149,6 @@ public:
     virtual void setShowDebugBorders(bool) = 0;
     virtual void setShowFPSCounter(bool) = 0;
     virtual void setShowPaintRects(bool) = 0;
-    virtual void setShowPlatformLayerTree(bool) = 0;
     virtual void setShrinksStandaloneImagesToFit(bool) = 0;
     virtual void setSmartInsertDeleteEnabled(bool) = 0;
     virtual void setStandardFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
index 6106671..0c0d2fd 100644 (file)
@@ -49,9 +49,7 @@ namespace WebKit {
 WebSettingsImpl::WebSettingsImpl(Settings* settings)
     : m_settings(settings)
     , m_showFPSCounter(false)
-    , m_showPlatformLayerTree(false)
     , m_showPaintRects(false)
-    , m_renderVSyncEnabled(true)
     , m_renderVSyncNotificationEnabled(false)
     , m_viewportEnabled(false)
     , m_initializeAtMinimumPageScale(true)
@@ -59,8 +57,6 @@ WebSettingsImpl::WebSettingsImpl(Settings* settings)
     , m_autoZoomFocusedNodeToLegibleScale(false)
     , m_deferredImageDecodingEnabled(false)
     , m_doubleTapToZoomEnabled(false)
-    , m_defaultTileSize(WebSize(256, 256))
-    , m_maxUntiledLayerSize(WebSize(512, 512))
 {
     ASSERT(settings);
 }
@@ -419,16 +415,6 @@ void WebSettingsImpl::setPrivilegedWebGLExtensionsEnabled(bool enabled)
     m_settings->setPrivilegedWebGLExtensionsEnabled(enabled);
 }
 
-void WebSettingsImpl::setRecordRenderingStats(bool enabled)
-{
-    m_recordRenderingStats = enabled;
-}
-
-void WebSettingsImpl::setRenderVSyncEnabled(bool enabled)
-{
-    m_renderVSyncEnabled = enabled;
-}
-
 void WebSettingsImpl::setRenderVSyncNotificationEnabled(bool enabled)
 {
     m_renderVSyncNotificationEnabled = enabled;
@@ -449,11 +435,6 @@ void WebSettingsImpl::setShowFPSCounter(bool show)
     m_showFPSCounter = show;
 }
 
-void WebSettingsImpl::setShowPlatformLayerTree(bool show)
-{
-    m_showPlatformLayerTree = show;
-}
-
 void WebSettingsImpl::setShowPaintRects(bool show)
 {
     m_showPaintRects = show;
@@ -464,11 +445,6 @@ void WebSettingsImpl::setEditingBehavior(EditingBehavior behavior)
     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);
@@ -701,11 +677,6 @@ void WebSettingsImpl::setShouldRespectImageOrientation(bool enabled)
     m_settings->setShouldRespectImageOrientation(enabled);
 }
 
-void WebSettingsImpl::setAcceleratedPaintingEnabled(bool enabled)
-{
-    m_settings->setAcceleratedDrawingEnabled(enabled);
-}
-
 void WebSettingsImpl::setMediaPlaybackRequiresUserGesture(bool required)
 {
     m_settings->setMediaPlaybackRequiresUserGesture(required);
@@ -721,16 +692,6 @@ void WebSettingsImpl::setViewportEnabled(bool enabled)
     m_viewportEnabled = enabled;
 }
 
-void WebSettingsImpl::setDefaultTileSize(WebSize size)
-{
-    m_defaultTileSize = size;
-}
-
-void WebSettingsImpl::setMaxUntiledLayerSize(WebSize size)
-{
-    m_maxUntiledLayerSize = size;
-}
-
 void WebSettingsImpl::setSyncXHRInDocumentsEnabled(bool enabled)
 {
     m_settings->setSyncXHRInDocumentsEnabled(enabled);
index 4218c26..e60a63c 100644 (file)
@@ -48,7 +48,6 @@ public:
     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);
@@ -59,7 +58,6 @@ public:
     virtual void setAcceleratedCompositingForScrollableFramesEnabled(bool);
     virtual void setAcceleratedCompositingForVideoEnabled(bool);
     virtual void setAcceleratedFiltersEnabled(bool);
-    virtual void setAcceleratedPaintingEnabled(bool);
     virtual void setAllowDisplayOfInsecureContent(bool);
     virtual void setAllowFileAccessFromFileURLs(bool);
     virtual void setAllowCustomScrollbarInMainFrame(bool);
@@ -81,7 +79,6 @@ public:
     virtual void setDefaultFixedFontSize(int);
     virtual void setDefaultFontSize(int);
     virtual void setDefaultTextEncodingName(const WebString&);
-    virtual void setDefaultTileSize(WebSize);
     virtual void setDefaultVideoPosterURL(const WebString&);
     virtual void setDeferred2dCanvasEnabled(bool);
     virtual void setDeferredImageDecodingEnabled(bool);
@@ -119,7 +116,6 @@ public:
     virtual void setLayoutFallbackWidth(int);
     virtual void setLoadsImagesAutomatically(bool);
     virtual void setLocalStorageEnabled(bool);
-    virtual void setMaxUntiledLayerSize(WebSize);
     virtual void setMediaPlaybackRequiresUserGesture(bool);
     virtual void setMemoryInfoEnabled(bool);
     virtual void setMinimumAccelerated2dCanvasSize(int);
@@ -137,8 +133,6 @@ public:
     virtual void setPictographFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
     virtual void setPluginsEnabled(bool);
     virtual void setPrivilegedWebGLExtensionsEnabled(bool);
-    virtual void setRecordRenderingStats(bool);
-    virtual void setRenderVSyncEnabled(bool);
     virtual void setRenderVSyncNotificationEnabled(bool);
     virtual void setSansSerifFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
     virtual void setSelectTrailingWhitespaceEnabled(bool);
@@ -151,7 +145,6 @@ public:
     virtual void setShowDebugBorders(bool);
     virtual void setShowFPSCounter(bool);
     virtual void setShowPaintRects(bool);
-    virtual void setShowPlatformLayerTree(bool);
     virtual void setShrinksStandaloneImagesToFit(bool);
     virtual void setSmartInsertDeleteEnabled(bool);
     virtual void setStandardFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
@@ -177,9 +170,7 @@ public:
     virtual void setXSSAuditorEnabled(bool);
 
     bool showFPSCounter() const { return m_showFPSCounter; }
-    bool showPlatformLayerTree() const { return m_showPlatformLayerTree; }
     bool showPaintRects() const { return m_showPaintRects; }
-    bool renderVSyncEnabled() const { return m_renderVSyncEnabled; }
     bool renderVSyncNotificationEnabled() const { return m_renderVSyncNotificationEnabled; }
     bool applyDeviceScaleFactorInCompositor() const;
     bool applyPageScaleFactorInCompositor() const;
@@ -188,17 +179,11 @@ public:
     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 recordRenderingStats() const { return m_recordRenderingStats; }
-    WebSize defaultTileSize() const { return m_defaultTileSize; }
-    WebSize maxUntiledLayerSize() const { return m_maxUntiledLayerSize; }
 
 private:
     WebCore::Settings* m_settings;
     bool m_showFPSCounter;
-    bool m_showPlatformLayerTree;
     bool m_showPaintRects;
-    bool m_renderVSyncEnabled;
     bool m_renderVSyncNotificationEnabled;
     bool m_viewportEnabled;
     bool m_initializeAtMinimumPageScale;
@@ -207,10 +192,6 @@ private:
     bool m_deferredImageDecodingEnabled;
     bool m_doubleTapToZoomEnabled;
     bool m_perTilePaintingEnabled;
-    bool m_acceleratedAnimationEnabled;
-    bool m_recordRenderingStats;
-    WebSize m_defaultTileSize;
-    WebSize m_maxUntiledLayerSize;
 };
 
 } // namespace WebKit
index 505d3a7..ba0ebb7 100644 (file)
@@ -1,3 +1,22 @@
+2013-03-19  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Remove compositor settings that don't go through WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=112718
+
+        Reviewed by Adam Barth.
+
+        * DumpRenderTree/chromium/DumpRenderTree.cpp:
+        (main):
+        * DumpRenderTree/chromium/TestRunner/public/WebPreferences.h:
+        * 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):
+
 2013-03-19  Dirk Pranke  <dpranke@chromium.org>
 
         Unreviewed, rolling out r146101.
index c4bffc3..4cfbd15 100644 (file)
@@ -60,7 +60,6 @@ static const char optionEnableThreadedCompositing[] = "--enable-threaded-composi
 static const char optionForceCompositingMode[] = "--force-compositing-mode";
 static const char optionEnableAccelerated2DCanvas[] = "--enable-accelerated-2d-canvas";
 static const char optionEnableDeferred2DCanvas[] = "--enable-deferred-2d-canvas";
-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";
@@ -140,7 +139,6 @@ int main(int argc, char* argv[])
     bool threadedHTMLParser = true;
     bool accelerated2DCanvasEnabled = false;
     bool deferred2DCanvasEnabled = false;
-    bool acceleratedPaintingEnabled = false;
     bool perTilePaintingEnabled = false;
     bool deferredImageDecodingEnabled = false;
     bool stressOpt = false;
@@ -149,7 +147,6 @@ int main(int argc, char* argv[])
     string javaScriptFlags;
     bool encodeBinary = false;
     bool noTimeout = false;
-    bool acceleratedAnimationEnabled = false;
     for (int i = 1; i < argc; ++i) {
         string argument(argv[i]);
         if (argument == "-")
@@ -188,8 +185,6 @@ int main(int argc, char* argv[])
             accelerated2DCanvasEnabled = true;
         else if (argument == optionEnableDeferred2DCanvas)
             deferred2DCanvasEnabled = true;
-        else if (argument == optionEnableAcceleratedPainting)
-            acceleratedPaintingEnabled = true;
         else if (argument == optionEnablePerTilePainting)
             perTilePaintingEnabled = true;
         else if (argument == optionEnableDeferredImageDecoding)
@@ -234,8 +229,6 @@ int main(int argc, char* argv[])
         shell.setThreadedHTMLParser(threadedHTMLParser);
         shell.setAccelerated2dCanvasEnabled(accelerated2DCanvasEnabled);
         shell.setDeferred2dCanvasEnabled(deferred2DCanvasEnabled);
-        shell.setAcceleratedPaintingEnabled(acceleratedPaintingEnabled);
-        shell.setAcceleratedAnimationEnabled(acceleratedAnimationEnabled);
         shell.setPerTilePaintingEnabled(perTilePaintingEnabled);
         shell.setDeferredImageDecodingEnabled(deferredImageDecodingEnabled);
         shell.setJavaScriptFlags(javaScriptFlags);
index caf264f..5644d09 100644 (file)
@@ -95,7 +95,6 @@ struct WEBTESTRUNNER_EXPORT WebPreferences {
     bool threadedHTMLParser;
     bool accelerated2dCanvasEnabled;
     bool deferred2dCanvasEnabled;
-    bool acceleratedPaintingEnabled;
     bool perTilePaintingEnabled;
     bool acceleratedAnimationEnabled;
     bool deferredImageDecodingEnabled;
index 3114fbd..9db5ae3 100644 (file)
@@ -120,11 +120,9 @@ void WebPreferences::reset()
     acceleratedCompositingEnabled = false;
     accelerated2dCanvasEnabled = false;
     deferred2dCanvasEnabled = false;
-    acceleratedPaintingEnabled = false;
     forceCompositingMode = false;
     threadedHTMLParser = true;
     perTilePaintingEnabled = false;
-    acceleratedAnimationEnabled = false;
     deferredImageDecodingEnabled = false;
     mediaPlaybackRequiresUserGesture = false;
     mockScrollbarsEnabled = false;
@@ -193,9 +191,7 @@ void WebPreferences::applyTo(WebView* webView)
     settings->setThreadedHTMLParser(threadedHTMLParser);
     settings->setAccelerated2dCanvasEnabled(accelerated2dCanvasEnabled);
     settings->setDeferred2dCanvasEnabled(deferred2dCanvasEnabled);
-    settings->setAcceleratedPaintingEnabled(acceleratedPaintingEnabled);
     settings->setPerTilePaintingEnabled(perTilePaintingEnabled);
-    settings->setAcceleratedAnimationEnabled(acceleratedAnimationEnabled);
     settings->setDeferredImageDecodingEnabled(deferredImageDecodingEnabled);
     settings->setMediaPlaybackRequiresUserGesture(mediaPlaybackRequiresUserGesture);
     settings->setMockScrollbarsEnabled(mockScrollbarsEnabled);
index 4e21031..d3db65e 100644 (file)
@@ -116,9 +116,7 @@ TestShell::TestShell()
     , m_threadedHTMLParser(true)
     , m_accelerated2dCanvasEnabled(false)
     , m_deferred2dCanvasEnabled(false)
-    , m_acceleratedPaintingEnabled(false)
     , m_perTilePaintingEnabled(false)
-    , m_acceleratedAnimationEnabled(false)
     , m_deferredImageDecodingEnabled(false)
     , m_stressOpt(false)
     , m_stressDeopt(false)
@@ -218,9 +216,7 @@ void TestShell::resetWebSettings(WebView& webView)
     m_prefs.forceCompositingMode = m_forceCompositingMode;
     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.threadedHTMLParser = m_threadedHTMLParser;
     m_prefs.applyTo(&webView);
index 02da1fc..ed7eafc 100644 (file)
@@ -122,9 +122,7 @@ public:
     void setThreadedHTMLParser(bool enabled) { m_threadedHTMLParser = enabled; }
     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 setDeferredImageDecodingEnabled(bool enabled) { m_deferredImageDecodingEnabled = enabled; }
 #if defined(OS_WIN)
     // Access to the finished event. Used by the static WatchDog thread.
@@ -219,9 +217,7 @@ private:
     bool m_threadedHTMLParser;
     bool m_accelerated2dCanvasEnabled;
     bool m_deferred2dCanvasEnabled;
-    bool m_acceleratedPaintingEnabled;
     bool m_perTilePaintingEnabled;
-    bool m_acceleratedAnimationEnabled;
     bool m_deferredImageDecodingEnabled;
     WebTestRunner::WebPreferences m_prefs;
     bool m_stressOpt;