aura: Enable use_canvas_skia=1 on aura.

BUG=111587,105550
TEST=manual

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

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

build/common.gypi

@@ -425,6 +425,15 @@
         }, {
           'enable_automation%': 1,
         }],
+
+        # Enable Skia UI text drawing incrementally on different platforms.
+        # http://crbug.com/105550
+        #
+        # On Aura, this allows per-tile painting to be used in the browser
+        # compositor.
+        ['use_aura==1', {
+          'use_canvas_skia%': 1,
+        }],
       ],
     },
 

ui/gfx/compositor/compositor.cc

@@ -123,10 +123,8 @@ Compositor::Compositor(CompositorDelegate* delegate,
       kTestRefreshRate : kDefaultRefreshRate;
   settings.partialSwapEnabled =
       command_line->HasSwitch(switches::kUIEnablePartialSwap);
-#if defined(PER_TILE_PAINTING)
   settings.perTilePainting =
     command_line->HasSwitch(switches::kUIEnablePerTilePainting);
-#endif
 
 #if defined(WEBLAYERTREEVIEW_HAS_INITIALIZE)
   host_.initialize(this, root_web_layer_, settings);

ui/gfx/compositor/compositor.gyp

@@ -63,11 +63,6 @@
             '<(DEPTH)/third_party/angle/src/build_angle.gyp:libGLESv2',
           ],
         }],
-        ['use_canvas_skia==1', {
-            'defines': [
-              'PER_TILE_PAINTING',
-          ],
-        }],
       ],
     },
     {