Flip the default value of the flag to enable scaling in ImageSkiaOperations.

 This also adds an option in flags page in case this caused the crash in the field.

This requres https://codereview.chromium.org/11684002/.

BUG=none
TEST=none


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

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

chrome/app/generated_resources.grd

@@ -6975,6 +6975,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION" desc="Description for the flag to disable accelerated video decode where available.">
         Disables hardware-accelerated video decode where available.
       </message>
+      <message name="IDS_FLAGS_ENABLE_SCALING_IN_IMAGE_SKIA_OPERATIONS_NAME" desc="Name of the flag to enable scaling in ImageSkiaOperations API.">
+        Enable scaling in ImageSkiaOperations.
+      </message>
+      <message name="IDS_FLAGS_ENABLE_SCALING_IN_IMAGE_SKIA_OPERATIONS_DESCRIPTION" desc="Description for the flag enable scaling in ImageSkiaOperations API.">
+        Allows ImageSkiaOperations API to operate on images at different scale factors.
+      </message>
       <message name="IDS_FLAGS_ENABLE_WEBKIT_TEXT_SUBPIXEL_POSITIONING_NAME" desc="Name of the flag to enable subpixel text positioning on web pages.">
         Enable webpage text sub-pixel positioning.
       </message>

chrome/browser/about_flags.cc

@@ -781,6 +781,13 @@ const Experiment kExperiments[] = {
     kOsWin,
     MULTI_VALUE_TYPE(kTouchOptimizedUIChoices)
   },
+  {
+    "enable-scaling-in-image-skia-operations",
+    IDS_FLAGS_ENABLE_SCALING_IN_IMAGE_SKIA_OPERATIONS_NAME,
+    IDS_FLAGS_ENABLE_SCALING_IN_IMAGE_SKIA_OPERATIONS_DESCRIPTION,
+    kOsCrOS | kOsWin,
+    SINGLE_VALUE_TYPE(gfx::switches::kEnableScalingInImageSkiaOperations)
+  },
   {
     "enable-webkit-text-subpixel-positioning",
     IDS_FLAGS_ENABLE_WEBKIT_TEXT_SUBPIXEL_POSITIONING_NAME,

ui/gfx/image/image_skia_operations.cc

@@ -26,8 +26,8 @@ namespace gfx {
 namespace {
 
 bool ScalingEnabled() {
-  static bool scale_images = !CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableScalingInImageSkiaOperations);
+  static bool scale_images = CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableScalingInImageSkiaOperations);
   return scale_images;
 }
 

ui/gfx/switches.cc

@@ -7,16 +7,16 @@
 namespace gfx {
 namespace switches {
 
-// Whether or not ImageSkiaOperations methods can scale one of images
-// if they don't have the same scale factor.
-const char kDisableScalingInImageSkiaOperations[] =
-    "disable-scaling-in-image-skia-operations";
-
 // Let text glyphs have X-positions that aren't snapped to the pixel grid in
 // the browser UI.
 const char kEnableBrowserTextSubpixelPositioning[] =
     "enable-browser-text-subpixel-positioning";
 
+// Whether or not ImageSkiaOperations methods can scale one of images
+// if they don't have the same scale factor.
+const char kEnableScalingInImageSkiaOperations[] =
+    "enable-scaling-in-image-skia-operations";
+
 // Enable text glyphs to have X-positions that aren't snapped to the pixel grid
 // in webkit renderers.
 const char kEnableWebkitTextSubpixelPositioning[] =

ui/gfx/switches.h

@@ -10,8 +10,8 @@
 namespace gfx {
 namespace switches {
 
-UI_EXPORT extern const char kDisableScalingInImageSkiaOperations[];
 UI_EXPORT extern const char kEnableBrowserTextSubpixelPositioning[];
+UI_EXPORT extern const char kEnableScalingInImageSkiaOperations[];
 UI_EXPORT extern const char kEnableWebkitTextSubpixelPositioning[];
 
 }  // namespace switches