Improve Skia configuration.

skia/skia_chrome.gypi

 # Copyright 2013 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.
 
 
 # This gypi file contains all the Chrome-specific enhancements to Skia.
 # In component mode (shared_lib) it is folded into a single shared library with
 # the Skia files but in all other cases it is a separate library.
 {
   'dependencies': [
     'skia_library',
     'skia_chrome_opts',
     '../base/base.gyp:base',
     '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
   ],
 
   'direct_dependent_settings': {
     'include_dirs': [
       'ext',
     ],
   },
 
-  'include_dirs': [
-    '..',
-  ],
-
   'sources': [
     'ext/analysis_canvas.cc',
     'ext/analysis_canvas.h',
     'ext/benchmarking_canvas.cc',
     'ext/benchmarking_canvas.h',
     'ext/bitmap_platform_device.h',
     'ext/bitmap_platform_device_android.cc',
     'ext/bitmap_platform_device_android.h',
     'ext/bitmap_platform_device_data.h',
     'ext/bitmap_platform_device_linux.cc',
     'ext/bitmap_platform_device_linux.h',
     'ext/bitmap_platform_device_mac.cc',
     'ext/bitmap_platform_device_mac.h',
     'ext/bitmap_platform_device_win.cc',
     'ext/bitmap_platform_device_win.h',
     'ext/convolver.cc',
     'ext/convolver.h',
     'ext/google_logging.cc',
     'ext/image_operations.cc',
     'ext/image_operations.h',
     'ext/lazy_pixel_ref.cc',
     'ext/lazy_pixel_ref.h',
     'ext/lazy_pixel_ref_utils.cc',
     'ext/lazy_pixel_ref_utils.h',
-    'ext/SkThread_chrome.cc',
     'ext/opacity_draw_filter.cc',
     'ext/opacity_draw_filter.h',
     'ext/paint_simplifier.cc',
     'ext/paint_simplifier.h',
     'ext/platform_canvas.cc',
     'ext/platform_canvas.h',
     'ext/platform_device.cc',
     'ext/platform_device.h',
     'ext/platform_device_linux.cc',
     'ext/platform_device_mac.cc',
@@ skipping 14 matching lines @@
     'ext/skia_utils_win.cc',
     'ext/skia_utils_win.h',
     'ext/vector_canvas.cc',
     'ext/vector_canvas.h',
     'ext/vector_platform_device_emf_win.cc',
     'ext/vector_platform_device_emf_win.h',
     'ext/vector_platform_device_skia.cc',
     'ext/vector_platform_device_skia.h',
   ],
   'conditions': [
-    # For POSIX platforms, prefer the Mutex implementation provided by Skia
-    # since it does not generate static initializers.
-    # TODO: should check if SK_USE_POSIX_THREADS is defined instead
-    [ 'OS == "android" or OS == "linux" or OS == "mac" or OS == "ios"', {
-      'sources!': [
-        'ext/SkThread_chrome.cc',
-      ],
-    }],
     [ 'OS == "android" and enable_printing == 0', {
       'sources!': [
         'ext/skia_utils_base.cc',
         'ext/vector_platform_device_skia.cc',
       ],
     }],
     ['OS == "ios"', {
       'sources/': [
         ['exclude', '^ext/vector_platform_device_skia\\.'],
       ],
       'dependencies!': [
         'skia_chrome_opts',
       ],
     }],
-    [ 'OS == "win"', {
-      'sources!': [
-        'ext/SkThread_chrome.cc',
-      ],
-    }],
     # TODO(scottmg): http://crbug.com/177306
     ['clang==1', {
       'xcode_settings': {
         'WARNING_CFLAGS!': [
           # Don't warn about string->bool used in asserts.
           '-Wstring-conversion',
         ],
       },
       'cflags!': [
         '-Wstring-conversion',
       ],
     }],
   ],
 
   'target_conditions': [
     # Pull in specific linux files for android (which have been filtered out
     # by file name rules).
     [ 'OS == "android"', {
       'sources/': [
         ['include', 'ext/platform_device_linux\\.cc$'],
       ],
     }],
   ],
 }