Snapshotting progress....

webkit/webkit.gyp

Index: webkit/webkit.gyp
===================================================================
--- webkit/webkit.gyp	(revision 11284)
+++ webkit/webkit.gyp	(working copy)
@@ -4111,12 +4111,45 @@
       ],
     },
     {
+      'target_name': 'webkit_resources',
+      'type': 'none',
+      'dependencies': [
+        'webcore',
+        'webkit',
+        '../net/net.gyp:net',
+      ],
+      'rules': [
+        {
+          'rule_name': 'grit',
+          'extension': 'grd',
+          'inputs': [
+            '../tools/grit/grit.py',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/<(RULE_INPUT_ROOT).h',
+          ],
+          'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/webkit'],
+        },
+      ],
+      'sources': [
+        # grit rule
+        'glue/webkit_resources.grd',
+        'glue/webkit_strings.grd',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(SHARED_INTERMEDIATE_DIR)/webkit',
+        ],
+      },
+    },
+    {
       'target_name': 'glue',
       'type': 'static_library',
       'dependencies': [
         'webcore',
         'webkit',
         '../net/net.gyp:net',
+        'webkit_resources',
       ],
       'actions': [
         {
@@ -4131,19 +4164,6 @@
           'action': ['python', '<@(_inputs)', '<(INTERMEDIATE_DIR)'],
         },
       ],
-      'rules': [
-        {
-          'rule_name': 'grit',
-          'extension': 'grd',
-          'inputs': [
-            '../tools/grit/grit.py',
-          ],
-          'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/<(RULE_INPUT_ROOT).h',
-          ],
-          'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/webkit'],
-        },
-      ],
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
       ],
@@ -4151,10 +4171,6 @@
         # webkit_version rule
         '../third_party/WebKit/WebCore/Configurations/Version.xcconfig',
 
-        # grit rule
-        'glue/webkit_resources.grd',
-        'glue/webkit_strings.grd',
-
         # This list contains all .h, .cc, and .mm files in glue except for
         # those in the test subdirectory and those with unittest in in their
         # names.
@@ -4340,6 +4356,11 @@
         'glue/webwidget_delegate.h',
         'glue/webwidget_impl.cc',
         'glue/webwidget_impl.h',
+        'glue/webworker.h',
+        'glue/webworker_impl.cc',
+        'glue/webworker_impl.h',
+        'glue/webworkerclient_impl.cc',
+        'glue/webworkerclient_impl.h',
         'glue/window_open_disposition.h',
         'pending/AccessibleBase.cpp',
         'pending/AccessibleBase.h',
@@ -4379,6 +4400,11 @@
             'glue/plugins/webplugin_delegate_impl.cc',
             'glue/glue_accessibility.cc',
             'glue/webdropdata.cc',
+            'glue/webworker.h',
+            'glue/webworker_impl.cc',
+            'glue/webworker_impl.h',
+            'glue/webworkerclient_impl.cc',
+            'glue/webworkerclient_impl.h',
             'pending/AccessibleBase.cpp',
             'pending/AccessibleDocument.cpp',
           ],