Split atomic and mutex implementations and make inlinable.

gyp/core.gyp

 # Core Skia library code.
 {
   'targets': [
     {
       'target_name': 'core',
       'product_name': 'skia_core',
       'type': 'static_library',
       'standalone_static_library': 1,
       'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76',
 
+      'variables': {
+        'variables': { 'conditions': [
+          [ 'skia_os == "win"', {
+            'skia_atomics_impl': 'win',
+            'skia_mutex_impl': 'win',
+          }, {

[djsollen, 2013/07/25 16:00:34]

Is this where we are supposed to put the android framework atomic check?  That
is when I add the skia_android_framework variable to gyp.

[bungeman-skia, 2013/09/26 17:16:23]

Yes, when we get a skia_android_framework I suppose that it would point atomics
at _android and mutexes at _pthread.

+            'skia_atomics_impl': 'sync',
+            'skia_mutex_impl': 'pthread',
+          }],
+        ]},
+        'skia_atomics_header': 'SkAtomics_<(skia_atomics_impl).h',
+        'skia_mutex_header': 'SkMutex_<(skia_mutex_impl).h',
+      },
+
+      'defines': [
+        'SK_ATOMICS_PLATFORM_H="<(skia_atomics_header)"',
+        'SK_MUTEX_PLATFORM_H="<(skia_mutex_header)"',
+      ],
+
       'includes': [
         'core.gypi',
       ],
 
       'include_dirs': [
         '../include/config',
         '../include/core',
         '../include/lazy',
         '../include/pathops',
         '../include/pipe',
         '../include/ports',
         '../include/utils',
         '../include/xml',
         '../src/core',
         '../src/image',
+        '../src/ports',
       ],
       'sources': [
         'core.gypi', # Makes the gypi appear in IDEs (but does not modify the build).
       ],
       'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800],
       'conditions': [
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
           'link_settings': {
             'libraries': [
               '-lpthread',
@@ skipping 52 matching lines @@
             '../src/core/SkUtilsArm.h',
           ],
         }],
         ['skia_gpu == 1', {
           'include_dirs': [
               '../include/gpu',
               '../src/gpu',
           ],
         }],
       ],
+      'all_dependent_settings': {
+        'defines': [
+          'SK_ATOMICS_PLATFORM_H="<(skia_atomics_header)"',
+          'SK_MUTEX_PLATFORM_H="<(skia_mutex_header)"',
+        ],
+        'include_dirs': [
+          '../src/ports',
+        ],
+      },
       'direct_dependent_settings': {
         'include_dirs': [
           'config',
           '../include/config',
           '../include/core',
           '../include/lazy',
           '../include/pathops',
           '../include/pipe',
           'ext',
         ],
@@ skipping 17 matching lines @@
       },
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: