Revert 267926 "Enable deferred image filters by default."

BUG=380791

> Enable deferred image filters by default.
> 
> This change flips the default for deferred filters to true in Chrome, and changes
> the enable command-line flag to a disable.
> 
> (The feature had already been force-enabled in Blink, but
> this will allow us to disable it properly from Chrome.)
> 
> BUG=368265
> 
> Review URL: https://codereview.chromium.org/260383005

TBR=senorblanco@chromium.org

Review URL: https://codereview.chromium.org/323883003

git-svn-id: svn://svn.chromium.org/chrome/branches/1985/src@275815 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc
index a477c17..9cd034d 100644
--- a/chrome/browser/chromeos/login/chrome_restart_request.cc
+++ b/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -105,7 +105,7 @@ std::string DeriveCommandLine(const GURL& start_url,
     ::switches::kEnableGestureTapHighlight,
     ::switches::kDisableGestureTapHighlight,
     ::switches::kDisableGpuSandbox,
-    ::switches::kDisableDeferredFilters,
+    ::switches::kEnableDeferredFilters,
     ::switches::kEnableContainerCulling,
     ::switches::kEnableDistanceFieldText,
     ::switches::kEnableGpuRasterization,
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 49a17ef..faea5bd 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -421,7 +421,7 @@ WebPreferences RenderViewHostImpl::GetWebkitPrefs(const GURL& url) {
       atoi(command_line.GetSwitchValueASCII(
       switches::kAcceleratedCanvas2dMSAASampleCount).c_str());
   prefs.deferred_filters_enabled =
-      !command_line.HasSwitch(switches::kDisableDeferredFilters);
+      command_line.HasSwitch(switches::kEnableDeferredFilters);
   prefs.container_culling_enabled =
       command_line.HasSwitch(switches::kEnableContainerCulling);
   prefs.lazy_layout_enabled =
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index 589f694..8bda023 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -318,8 +318,8 @@ const char kDomAutomationController[]       = "dom-automation";
 const char kEnableBleedingEdgeRenderingFastPaths[] =
     "enable-bleeding-edge-rendering-fast-paths";
 
-// Disable deferred image filters.
-const char kDisableDeferredFilters[]         = "disable-deferred-filters";
+// Disable gpu-accelerated 2d canvas.
+const char kEnableDeferredFilters[]         = "enable-deferred-filters";
 
 // Enables accelerated compositing for backgrounds of root layers with
 // background-attachment: fixed.
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index c8c97bca..cb3df41 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -100,7 +100,7 @@ extern const char kDisableXSSAuditor[];
 CONTENT_EXPORT extern const char kDisableZeroCopy[];
 CONTENT_EXPORT extern const char kDomAutomationController[];
 CONTENT_EXPORT extern const char kEnableBleedingEdgeRenderingFastPaths[];
-CONTENT_EXPORT extern const char kDisableDeferredFilters[];
+CONTENT_EXPORT extern const char kEnableDeferredFilters[];
 CONTENT_EXPORT extern const char kEnableAcceleratedFixedRootBackground[];
 CONTENT_EXPORT extern const char kEnableAcceleratedOverflowScroll[];
 CONTENT_EXPORT extern const char kEnableLayerSquashing[];