Modifications to skia.gyp for WebKit side code suppressions.

skia/skia.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'skia',
       'type': '<(component)',
       'variables': {
         'conditions': [
           ['OS== "ios"', {
             'skia_support_gpu': 0,
           }, {
             'skia_support_gpu': 1,
           }],
+
+          ['inside_chromium_build==0', {
+            'webkit_src_dir': '<(DEPTH)/../../..',
+          },{
+            'webkit_src_dir': '<(DEPTH)/third_party/WebKit',
+          }],
         ],
 
         'optimize': 'max',
 
         # These two set the paths so we can include skia/gyp/core.gypi
         'skia_src_path': '../third_party/skia/src',
         'skia_include_path': '../third_party/skia/include',
       },
 
       'includes': [
@@ skipping 186 matching lines @@
         'SK_BUILD_NO_IMAGE_ENCODE',
         'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
         'GR_STATIC_RECT_VB=1',
         'GR_AGGRESSIVE_SHADER_OPTS=1',
         'SK_DISABLE_FAST_AA_STROKE_RECT',
         'SK_DEFERRED_CANVAS_USES_GPIPE=1',
         
         # this flag can be removed entirely once this has baked for a while
         'SK_ALLOW_OVER_32K_BITMAPS',
 
-        # temporary for landing Skia rev 3077 with minimal layout test breakage
-        'SK_SIMPLE_TWOCOLOR_VERTICAL_GRADIENTS',
-
         # skia uses static initializers to initialize the serialization logic
         # of its "pictures" library. This is currently not used in chrome; if
         # it ever gets used the processes that use it need to call
         # SkGraphics::Init().
         'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0',
 
-        # Temporarily disable the Skia fix in
-        # http://code.google.com/p/skia/source/detail?r=3037 ; enabling that
-        # fix will require substantial rebaselining.
-        'SK_DRAW_POS_TEXT_IGNORE_SUBPIXEL_LEFT_ALIGN_FIX',
-
-        # Temporarily ignore fix to antialias coverage, until we can rebaseline
-        'SK_USE_LEGACY_AA_COVERAGE',
-
         # Temporarily keep old int-srcrect behavior, until we determine if
         # the few failures are a bug or not.
         'SK_SUPPORT_INT_SRCRECT_DRAWBITMAPRECT',
       ],
       'sources!': [
         '../third_party/skia/include/core/SkTypes.h',
       ],
       'conditions': [
         ['skia_support_gpu != 0', {
           'includes': [
@@ skipping 63 matching lines @@
             ['exclude', '_android\\.(cc|cpp)$'],
           ],
           'defines': [
             'SK_DEFAULT_FONT_CACHE_LIMIT=(20*1024*1024)',
           ],
         }],
         [ 'OS != "ios"', {
           'sources/': [
             ['exclude', '_ios\\.(cc|cpp|mm?)$'],
           ],
+          'dependencies': [
+            '<(webkit_src_dir)/Source/WebKit/chromium/skia_webkit.gyp:skia_webkit',
+          ],
         }],
         [ 'OS != "mac"', {
           'sources/': [
             ['exclude', '_mac\\.(cc|cpp|mm?)$'],
             ['exclude', '/mac/']
           ],
         }],
         [ 'OS != "win"', {
           'sources/': [ ['exclude', '_win\\.(cc|cpp)$'] ],
         }],
@@ skipping 500 matching lines @@
           'sources': [
             '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
           ],
         },
       ],
     }],
   ],
 }