Include entries to blink_resources.

We can't remove entries of webkit_chromium_resources just yet, because on Blink side DumpRenderTree is still using it through Chromium :( TBR=abarth@chromium.org, joth@chromium.org, thestig@chromium.org Review URL: https://codereview.chromium.org/20329005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214239 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Jul 29, 2013 · db8dc3f · db8dc3f
1 parent a2024ca
commit db8dc3f
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 7 deletions.
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
@@ -53,6 +53,7 @@
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
             ],

diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
@@ -147,6 +147,7 @@
                 '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
               ],
               'include_dirs': [

diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi
@@ -15,6 +15,7 @@
         'pak_inputs': [
           '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
           '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',
+          '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
           '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
         ],
       }],

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
@@ -452,6 +452,7 @@
             '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
 
             'browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc',
@@ -1926,6 +1927,7 @@
             '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
           ],
           'include_dirs': [
@@ -2164,6 +2166,7 @@
             '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
           ],
           'include_dirs': [
@@ -2547,6 +2550,7 @@
             '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
           ],
           'include_dirs': [

diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
@@ -2339,6 +2339,7 @@
             '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
           ],
           'link_settings': {

diff --git a/chrome/test/gpu/test_support_gpu.gypi b/chrome/test/gpu/test_support_gpu.gypi
@@ -59,6 +59,7 @@
         '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
         '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
       ],
       'conditions': [

diff --git a/content/DEPS b/content/DEPS
@@ -27,6 +27,7 @@ include_rules = [
   "-cc/base/scoped_ptr_vector.h",
 
   "+crypto",
+  "+grit/blink_resources.h",
   "+grit/content_resources.h",
   "+grit/ui_resources.h",
   "+grit/ui_strings.h",

diff --git a/content/browser/gpu/test_support_gpu.gypi b/content/browser/gpu/test_support_gpu.gypi
@@ -28,6 +28,7 @@
       'sources': [
         '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+        '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
       ],
       'conditions': [

diff --git a/content/content_shell.gypi b/content/content_shell.gypi
@@ -319,6 +319,7 @@
               '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',

diff --git a/content/content_tests.gypi b/content/content_tests.gypi
@@ -894,6 +894,7 @@
                 # but that causes errors in other targets when
                 # resulting .res files get referenced multiple times.
                 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
                 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
               ],

diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
@@ -66,15 +66,9 @@
   "chrome_frame/resources/chrome_frame_resources.grd": {
     "includes": [8000],
   },
-  # WebKit.grd can be in two different places depending on whether we are
-  # in a chromium checkout or a webkit-only checkout.
   "third_party/WebKit/Source/WebKit/chromium/WebKit.grd": {
     "includes": [8500],
   },
-  "WebKit.grd": {
-    "includes": [8500],
-  },
-
   "ui/base/strings/app_locale_settings.grd": {
     "messages": [9000],
   },
@@ -223,5 +217,8 @@
   "components/component_strings.grd": {
     "messages": [30000],
   },
+  "third_party/WebKit/public/blink_resources.grd": {
+    "includes": [30500],
+  },
   # Resource ids starting at 31000 are reserved for projects built on Chromium.
 }
diff --git a/webkit/webkit_resources.gyp b/webkit/webkit_resources.gyp
@@ -19,12 +19,19 @@
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
-          'action_name': 'blink_chromium_resources',
+          'action_name': 'webkit_chromium_resources',
           'variables': {
             'grit_grd_file': '../third_party/WebKit/Source/WebKit/chromium/WebKit.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
+        {
+          'action_name': 'blink_chromium_resources',
+          'variables': {
+            'grit_grd_file': '../third_party/WebKit/public/blink_resources.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
       ],
       'includes': [ '../build/grit_target.gypi' ],
       'direct_dependent_settings': {