Improve Skia configuration.

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_configuration',

[djsollen, 2013/07/25 15:30:18]

your going to need to rebase this change on the new skia.gyp as this entire file
was recently refactored by robert and I.

+      'type': 'none',
+
+      'direct_dependent_settings': {
+        'defines': [
+          'SK_BUILD_NO_IMAGE_ENCODE',
+          'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
+          'GR_STATIC_RECT_VB=1',
+          'GR_AGGRESSIVE_SHADER_OPTS=1',
+          'SK_DEFERRED_CANVAS_USES_GPIPE=1',
+          'SK_ENABLE_INST_COUNT=0',
+
+          # These are set conditionally below.
+          #'SK_GAMMA_SRGB',
+          #'SK_GAMMA_APPLY_TO_A8',
+
+          # this flag can be removed entirely once this has baked for a while
+          'SK_ALLOW_OVER_32K_BITMAPS',
+
+          # 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',
+
+          # Disable this check because it is too strict for some Chromium
+          # specific subclasses of SkPixelRef. See bug: crbug.com/171776.
+          'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK',
+
+          'IGNORE_ROT_AA_RECT_OPT',
+        ],
+
+        'conditions': [
+          # Settings for atomics and mutexes
+          [ 'OS == "win"', {
+            'defines': [
+              'SK_ATOMICS_PLATFORM_H="skia/ext/SkAtomics_chrome.h"',
+              'SK_MUTEX_PLATFORM_H="third_party/skia/src/ports/SkMutex_win.h"',
+            ],
+          }],
+          [ 'OS in ["linux", "freebsd", "openbsd", "netbsd", "solaris",
+                    "android", "mac", "ios"]', {
+            # For POSIX platforms, prefer the Mutex implementation provided by
+            # Skia since it does not generate static initializers.
+            'defines': [
+              'SK_USE_POSIX_THREADS',
+              'SK_ATOMICS_PLATFORM_H="skia/ext/SkAtomics_chromium.h"',
+              'SK_MUTEX_PLATFORM_H="third_party/skia/src/ports/SkMutex_pthread.h"',
+            ],
+          }],
+
+          #Settings for text blitting, chosen to approximate the system browser.
+          [ 'OS == "linux"', {
+            'defines': [
+              'SK_GAMMA_EXPONENT=1.2',
+              'SK_GAMMA_CONTRAST=0.2',
+            ],
+          }],
+          ['OS == "android"', {
+            'defines': [
+              'SK_GAMMA_APPLY_TO_A8',
+              'SK_GAMMA_EXPONENT=1.4',
+              'SK_GAMMA_CONTRAST=0.0',
+            ],
+          }],
+          ['OS == "win"', {
+            'defines': [
+              'SK_GAMMA_SRGB',
+              'SK_GAMMA_CONTRAST=0.5',
+            ],
+          }],
+          ['OS == "mac"', {
+            'defines': [
+              'SK_GAMMA_SRGB',
+              'SK_GAMMA_CONTRAST=0.0',
+            ],
+          }],
+        ],
+      },
+    },
+    {
       'target_name': 'skia',
       'type': '<(component)',
+      'dependencies': [
+        'skia_configuration',
+        'skia_opts',
+        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../third_party/sfntly/sfntly.gyp:sfntly',
+        '../third_party/zlib/zlib.gyp:zlib',
+      ],
+      'export_dependent_settings': [
+        'skia_configuration',
+      ],
+
       'variables': {
         'conditions': [
           ['OS== "ios"', {
             'skia_support_gpu': 0,
           }, {
             'skia_support_gpu': 1,
           }],
         ],
 
         'optimize': 'max',
@@ skipping 158 matching lines @@
         '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/SkThread_chrome.cc',
         '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',
         'ext/platform_device_win.cc',
         'ext/recursive_gaussian_convolution.cc',
@@ skipping 29 matching lines @@
         '../third_party/skia/include/pipe',
         '../third_party/skia/include/ports',
         '../third_party/skia/include/utils',
         '../third_party/skia/src/core',
         '../third_party/skia/src/image',
         '../third_party/skia/src/sfnt',
         '../third_party/skia/src/utils',
         '../third_party/skia/src/lazy',
       ],
       'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800],
-      'defines': [
-        #'SK_GAMMA_SRGB',
-        #'SK_GAMMA_APPLY_TO_A8',
-        'SK_BUILD_NO_IMAGE_ENCODE',
-        'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
-        'GR_STATIC_RECT_VB=1',
-        'GR_AGGRESSIVE_SHADER_OPTS=1',
-        'SK_DEFERRED_CANVAS_USES_GPIPE=1',
-        'SK_ENABLE_INST_COUNT=0',
 
-        # this flag can be removed entirely once this has baked for a while
-        'SK_ALLOW_OVER_32K_BITMAPS',
-
-        # 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',
-
-        # Disable this check because it is too strict for some Chromium-specific
-        # subclasses of SkPixelRef. See bug: crbug.com/171776.
-        'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK',
-
-        'IGNORE_ROT_AA_RECT_OPT',
-      ],
       'sources!': [
         '../third_party/skia/include/core/SkTypes.h',
       ],
       'conditions': [
         ['skia_support_gpu != 0', {
           'includes': [
             '../third_party/skia/gyp/gpu.gypi',
           ],
           'sources': [
             '<@(skgpu_sources)',
           ],
           'include_dirs': [
             '../third_party/skia/include/gpu',
             '../third_party/skia/include/gpu/gl',
             '../third_party/skia/src/gpu',
           ],
         }, {  # skia_support_gpu == 0
           'defines': [
             'SK_SUPPORT_GPU=0',
           ],
         }],
-        #Settings for text blitting, chosen to approximate the system browser.
-        [ 'OS == "linux"', {
-          'defines': [
-            'SK_GAMMA_EXPONENT=1.2',
-            'SK_GAMMA_CONTRAST=0.2',
-          ],
-        }],
-        ['OS == "android"', {
-          'defines': [
-            'SK_GAMMA_APPLY_TO_A8',
-            'SK_GAMMA_EXPONENT=1.4',
-            'SK_GAMMA_CONTRAST=0.0',
-          ],
-        }],
-        ['OS == "win"', {
-          'defines': [
-            'SK_GAMMA_SRGB',
-            'SK_GAMMA_CONTRAST=0.5',
-          ],
-        }],
-        ['OS == "mac"', {
-          'defines': [
-            'SK_GAMMA_SRGB',
-            'SK_GAMMA_CONTRAST=0.0',
-          ],
-        }],
 
-        # For POSIX platforms, prefer the Mutex implementation provided by Skia
-        # since it does not generate static initializers.
-        [ 'OS == "android" or OS == "linux" or OS == "mac" or OS == "ios"', {
-          'defines+': [
-            'SK_USE_POSIX_THREADS',
-          ],
-          'direct_dependent_settings': {
-            'defines': [
-              'SK_USE_POSIX_THREADS',
-            ],
-          },
-          'sources!': [
-            'ext/SkThread_chrome.cc',
-          ],
-        }],
         [ 'OS != "android"', {
           'sources/': [
             ['exclude', '_android\\.(cc|cpp)$'],
           ],
           'sources!': [
             '../third_party/skia/src/core/SkPaintOptionsAndroid.cpp',
           ],
           'defines': [
             'SK_DEFAULT_FONT_CACHE_LIMIT=(20*1024*1024)',
           ],
@@ skipping 47 matching lines @@
           ],
           'cflags': [
             '-Wno-unused',
             '-Wno-unused-function',
           ],
           'sources': [
             '../third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp',
             '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp',
             '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp',
           ],
-          'defines': [
-#            'SK_USE_COLOR_LUMINANCE',
-          ],
         }],
         [ 'use_glib == 0 and OS != "android"', {
           'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'] ],
           'sources!': [
             '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
             '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp',
           ],
         }],
         [ 'toolkit_uses_gtk == 1', {
           'dependencies': [
@@ skipping 52 matching lines @@
             [ '_toolset=="host" and host_os=="linux"', {
               'sources': [
                 'ext/platform_device_linux.cc',
               ],
             }],
           ],
         }],
         [ 'OS == "ios"', {
           'defines': [
             'SK_BUILD_FOR_IOS',
-            'SK_USE_MAC_CORE_TEXT',
           ],
           'include_dirs': [
             '../third_party/skia/include/utils/ios',
             '../third_party/skia/include/utils/mac',
           ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework',
             ],
           },
@@ skipping 12 matching lines @@
           ],
           'sources/': [
             ['exclude', '/pdf/'],
             ['exclude', '^ext/vector_platform_device_skia\\.'],
             ['exclude', 'opts_check_SSE2\\.cpp$'],
           ],
         }],
         [ 'OS == "mac"', {
           'defines': [
             'SK_BUILD_FOR_MAC',
-            'SK_USE_MAC_CORE_TEXT',
-#           'SK_USE_COLOR_LUMINANCE',
           ],
           'include_dirs': [
             '../third_party/skia/include/utils/mac',
           ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
             ],
           },
           'sources': [
             '../third_party/skia/src/utils/mac/SkStream_mac.cpp',
           ],
         }],
         [ 'OS == "win"', {
           'sources!': [
             '../third_party/skia/src/ports/SkOSFile_posix.cpp',
             '../third_party/skia/src/ports/SkThread_pthread.cpp',
             '../third_party/skia/src/ports/SkTLS_pthread.cpp',
             '../third_party/skia/src/ports/SkTime_Unix.cpp',
-            'ext/SkThread_chrome.cc',
           ],
           'include_dirs': [
             'config/win',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               'config/win',
             ],
           },
         }],
@@ skipping 20 matching lines @@
             'WARNING_CFLAGS!': [
               # Don't warn about string->bool used in asserts.
               '-Wstring-conversion',
             ],
           },
           'cflags!': [
             '-Wstring-conversion',
           ],
         }],
       ],
-      'dependencies': [
-        'skia_opts',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../third_party/sfntly/sfntly.gyp:sfntly',
-        '../third_party/zlib/zlib.gyp:zlib',
-      ],
       'direct_dependent_settings': {
         'include_dirs': [
           'config',
 
           #temporary until we can hide SkFontHost
           '../third_party/skia/src/core',
 
           '../third_party/skia/include/config',
           '../third_party/skia/include/core',
           '../third_party/skia/include/effects',
           '../third_party/skia/include/pdf',
           '../third_party/skia/include/gpu',
           '../third_party/skia/include/gpu/gl',
           '../third_party/skia/include/lazy',
           '../third_party/skia/include/pathops',
           '../third_party/skia/include/pipe',
           '../third_party/skia/include/ports',
           '../third_party/skia/include/utils',
           'ext',
         ],
-        'defines': [
-          'SK_BUILD_NO_IMAGE_ENCODE',
-          'SK_DEFERRED_CANVAS_USES_GPIPE=1',
-          'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
-          'GR_AGGRESSIVE_SHADER_OPTS=1',
-          'SK_ENABLE_INST_COUNT=0',
-        ],
         'conditions': [
           ['OS=="android"', {
             'dependencies!': [
               'skia_opts',
               '../third_party/zlib/zlib.gyp:zlib',
             ],
             'defines': [
               # Don't use non-NDK available stuff.
               'SK_BUILD_FOR_ANDROID',
             ],
@@ skipping 39 matching lines @@
     # SSE2, Linux x86_64 has SSE2 by definition, and MSC will happily emit
     # SSE2 from instrinsics, which generating plain ol' 386 for everything
     # else).  However, to keep the .gyp file simple and avoid platform-specific
     # build breakage, we do this on all platforms.
 
     # For about the same reason, we need to compile the ARM opts files
     # separately as well.
     {
       'target_name': 'skia_opts',
       'type': 'static_library',
+      'dependencies': [
+        'skia_configuration',
+      ],
       'variables': {
         'optimize': 'max',
       },
       'include_dirs': [
         '..',
         'config',
         '../third_party/skia/include/config',
         '../third_party/skia/include/core',
         '../third_party/skia/include/effects',
         '../third_party/skia/include/images',
@@ skipping 26 matching lines @@
           'conditions': [
             # x86 Android doesn't support SSSE3 instructions.
             [ 'OS != "android"', {
               'dependencies': [
                 'skia_opts_ssse3',
               ],
             }],
           ],
         }],
         [ 'target_arch == "arm"', {
+          'dependencies': [
+            'skia_configuration',
+          ],
           'conditions': [
             [ 'arm_version >= 7 and arm_neon == 1', {
               'defines': [
                 '__ARM_HAVE_NEON',
               ],
             }],
             [ 'arm_version >= 7 and arm_neon_optional == 1', {
               'defines': [
                 '__ARM_HAVE_OPTIONAL_NEON_SUPPORT',
               ],
@@ skipping 58 matching lines @@
         }],
       ],
     },
     # For the same lame reasons as what is done for skia_opts, we have to
     # create another target specifically for SSSE3 code as we would not want
     # to compile the SSE2 code with -mssse3 which would potentially allow
     # gcc to generate SSSE3 code.
     {
       'target_name': 'skia_opts_ssse3',
       'type': 'static_library',
+      'dependencies': [
+        'skia_configuration',
+      ],
       'variables': {
         'optimize': 'max',
       },
       'include_dirs': [
         '..',
         'config',
         '../third_party/skia/include/config',
         '../third_party/skia/include/core',
         '../third_party/skia/include/pathops',
         '../third_party/skia/src/core',
@@ skipping 26 matching lines @@
         }],
       ],
     },
     # NEON code must be compiled with -mfpu=neon which also affects scalar
     # code. To support dynamic NEON code paths, we need to build all
     # NEON-specific sources in a separate static library. The situation
     # is very similar to the SSSE3 one.
     {
       'target_name': 'skia_opts_neon',
       'type': 'static_library',
+      'dependencies': [
+        'skia_configuration',
+      ],
       'include_dirs': [
         '..',
         'config',
         '../third_party/skia/include/config',
         '../third_party/skia/include/core',
         '../third_party/skia/src/core',
         '../third_party/skia/src/opts',
       ],
       'cflags!': [
         '-fno-omit-frame-pointer',
@@ skipping 32 matching lines @@
           ],
         }],
       ],
     },
     {
       'target_name': 'image_operations_bench',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         'skia',
+        'skia_configuration',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'ext/image_operations_bench.cc',
       ],
     },
   ],
   'conditions': [
     ['OS=="ios"', {
       'targets': [
         # The main skia_opts target does not currently work on iOS because the
         # target architecture on iOS is determined at compile time rather than
         # gyp time (simulator builds are x86, device builds are arm).  As a
         # temporary measure, this is a separate opts target for iOS-only, using
         # the _none.cpp files to avoid architecture-dependent implementations.
         {
           'target_name': 'skia_opts_ios',
           'type': 'static_library',
+          'dependencies': [
+            'skia_configuration',
+          ],
           'include_dirs': [
             '..',
             'config',
             '../third_party/skia/include/config',
             '../third_party/skia/include/core',
             '../third_party/skia/include/effects',
             '../third_party/skia/include/images',
             '../third_party/skia/include/lazy',
             '../third_party/skia/include/pathops',
             '../third_party/skia/include/utils',
             '../third_party/skia/src/core',
           ],
           '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',
           ],
         },
       ],
     }],
   ],
 }