Disabling deferred 2D canvas rendering

Resubmit of r145925

BUG=136828
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10702038


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150889 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/about_flags.cc

@@ -258,13 +258,6 @@ const Experiment kExperiments[] = {
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)
   },
-  {
-    "disable-deferred-2d-canvas",
-    IDS_FLAGS_DISABLE_DEFERRED_2D_CANVAS_NAME,
-    IDS_FLAGS_DISABLE_DEFERRED_2D_CANVAS_DESCRIPTION,
-    kOsAll,
-    SINGLE_VALUE_TYPE(switches::kDisableDeferred2dCanvas)
-  },
   {
     "disable-threaded-animation",
     IDS_FLAGS_DISABLE_THREADED_ANIMATION_NAME,

content/browser/web_contents/web_contents_impl.cc

@@ -503,7 +503,7 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
       GpuProcessHost::gpu_enabled() &&
       !command_line.HasSwitch(switches::kDisableAccelerated2dCanvas);
   prefs.deferred_2d_canvas_enabled =
-      !command_line.HasSwitch(switches::kDisableDeferred2dCanvas);
+      command_line.HasSwitch(switches::kEnableDeferred2dCanvas);
   prefs.accelerated_painting_enabled =
       GpuProcessHost::gpu_enabled() &&
       command_line.HasSwitch(switches::kEnableAcceleratedPainting);

content/public/common/content_switches.cc

@@ -77,9 +77,6 @@ const char kDisableDatabases[]              = "disable-databases";
 // Disables data transfer items.
 const char kDisableDataTransferItems[]      = "disable-data-transfer-items";
 
-// Disable deferred 2d canvas rendering.
-const char kDisableDeferred2dCanvas[]        = "disable-deferred-2d-canvas";
-
 // Disables desktop notifications (default enabled on windows).
 const char kDisableDesktopNotifications[]   = "disable-desktop-notifications";
 
@@ -264,6 +261,9 @@ const char kEnableCssShaders[]              = "enable-css-shaders";
 // Enables CSS variables
 const char kEnableCssVariables[]            = "enable-css-variables";
 
+// Enable deferred 2d canvas rendering.
+const char kEnableDeferred2dCanvas[]        = "enable-deferred-2d-canvas";
+
 // Enables device motion events.
 const char kEnableDeviceMotion[]            = "enable-device-motion";
 

content/public/common/content_switches.h

@@ -34,7 +34,7 @@ CONTENT_EXPORT extern const char kDisableAudio[];
 extern const char kDisableBackingStoreLimit[];
 CONTENT_EXPORT extern const char kDisableDatabases[];
 extern const char kDisableDataTransferItems[];
-CONTENT_EXPORT extern const char kDisableDeferred2dCanvas[];
+CONTENT_EXPORT extern const char kEnableDeferred2dCanvas[];
 extern const char kDisableDesktopNotifications[];
 CONTENT_EXPORT extern const char kDisableDeviceOrientation[];
 #if defined(OS_ANDROID)