Remove "use_skia" variable from gyp.

We've now switched to Skia from CoreGraphics entirely. See
http://crbug.com/110881 for details.

This change removes the vestigal "use_skia" variable. I'll send follow-up
patches to remove uses of USE_SKIA from Chromium source.

BUG=110881
TBR=gene


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

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

3 files changed, 5 insertions, 35 deletions

diff --git a/build/common.gypi b/build/common.gypi
index 2eed0ad2d..a5e6e0f 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -414,15 +414,6 @@
       'spdy_proxy_auth_property%' : '',
 
       'conditions': [
-        # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
-        # the 'conditions' clause.  Initial attempts resulted in chromium and
-        # webkit disagreeing on its setting.
-        ['OS=="mac"', {
-          'use_skia%': 1,
-        }, {
-          'use_skia%': 1,
-        }],
-
         # A flag for POSIX platforms
         ['OS=="win"', {
           'os_posix%': 0,
@@ -680,7 +671,6 @@
     'os_posix%': '<(os_posix)',
     'use_glib%': '<(use_glib)',
     'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
-    'use_skia%': '<(use_skia)',
     'use_x11%': '<(use_x11)',
     'use_gnome_keyring%': '<(use_gnome_keyring)',
     'linux_fpic%': '<(linux_fpic)',
@@ -1659,6 +1649,9 @@
         }],
       ],
     },
+    # TODO(teravest): Remove this define once uses of USE_SKIA are cleaned up
+    # throughout the codebase.
+    'defines' : ['USE_SKIA'],
     'conditions': [
       ['OS=="linux" and linux_use_tcmalloc==1 and clang_type_profiler==1', {
         'cflags_cc!': ['-fno-rtti'],
@@ -1864,11 +1857,6 @@
           'ENABLE_EGLIMAGE=1',
         ],
       }],
-      ['use_skia==1', {
-        'defines': [
-          'USE_SKIA=1',
-        ],
-      }],
       ['asan==1 and OS=="win"', {
         # Since asan on windows uses Syzygy, we need /PROFILE turned on to
         # produce appropriate pdbs.
diff --git a/printing/printing.gyp b/printing/printing.gyp
index 3ac3442..8490a03 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -113,12 +113,6 @@
             '../build/linux/system.gyp:gtkprint',
           ],
         }],
-        ['OS=="mac" and use_skia==0', {
-          'sources/': [
-            ['exclude', 'pdf_metafile_skia\\.(cc|h)$'],
-            ['exclude', 'metafile_skia_wrapper\\.(cc|h)$'],
-          ],
-        }],
         # Mac-Aura does not support printing.
         ['OS=="mac" and use_aura==1',{
           'sources!': [
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 25449ba..e6555b6 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -475,6 +475,8 @@
         [ 'OS == "mac"', {
           'defines': [
             'SK_BUILD_FOR_MAC',
+            'SK_USE_MAC_CORE_TEXT',
+#           'SK_USE_COLOR_LUMINANCE',
           ],
           'include_dirs': [
             '../third_party/skia/include/utils/mac',
@@ -492,20 +494,6 @@
             # so no need for these generic versions.
             '../third_party/skia/src/ports/SkFontHost_tables.cpp',
           ],
-          'conditions': [
-             [ 'use_skia == 0', {
-               'sources/': [
-                 ['exclude', '/pdf/'],
-                 ['exclude', 'ext/vector_platform_device_skia\\.(cc|h)'],
-               ],
-            },
-            { # use_skia
-              'defines': [
-                'SK_USE_MAC_CORE_TEXT',
-#                'SK_USE_COLOR_LUMINANCE',
-              ],
-            }],
-          ],
         }],
         [ 'OS == "win"', {
           'sources!': [