summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--android_webview/android_webview.gyp1
-rw-r--r--chrome/chrome_dll.gypi1
-rw-r--r--chrome/chrome_repack_chrome.gypi1
-rw-r--r--chrome/chrome_tests.gypi4
-rw-r--r--chrome/test/gpu/test_support_gpu.gypi1
-rw-r--r--content/DEPS1
-rw-r--r--content/browser/gpu/test_support_gpu.gypi1
-rw-r--r--content/content_shell.gypi1
-rw-r--r--content/content_tests.gypi1
-rw-r--r--tools/gritsettings/resource_ids3
-rw-r--r--webkit/child/webkitplatformsupport_impl.cc2
-rw-r--r--webkit/common/cursors/webcursor_mac.mm2
-rw-r--r--webkit/support/platform_support_win.cc2
-rw-r--r--webkit/webkit_resources.gyp7
14 files changed, 25 insertions, 3 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index d353ad1..299dc12 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -54,6 +54,7 @@
'<(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
index 3ddb424..be31227 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -148,6 +148,7 @@
'<(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': [
'<(DEPTH)/third_party/wtl/include',
diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi
index a895435..80683c5 100644
--- a/chrome/chrome_repack_chrome.gypi
+++ b/chrome/chrome_repack_chrome.gypi
@@ -16,6 +16,7 @@
'<(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',
],
}],
['enable_extensions==1', {
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 78eaa4d..e96fc93 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -455,6 +455,7 @@
'<(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',
],
@@ -1923,6 +1924,7 @@
'<(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': [
'<(DEPTH)/third_party/wtl/include',
@@ -2161,6 +2163,7 @@
'<(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': [
'<(DEPTH)/third_party/wtl/include',
@@ -2544,6 +2547,7 @@
'<(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': [
'<(DEPTH)/third_party/wtl/include',
diff --git a/chrome/test/gpu/test_support_gpu.gypi b/chrome/test/gpu/test_support_gpu.gypi
index 083c0e3..4be0e525 100644
--- a/chrome/test/gpu/test_support_gpu.gypi
+++ b/chrome/test/gpu/test_support_gpu.gypi
@@ -60,6 +60,7 @@
'<(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': [
['win_use_allocator_shim==1', {
diff --git a/content/DEPS b/content/DEPS
index 11aa6bd..f57609a 100644
--- a/content/DEPS
+++ b/content/DEPS
@@ -31,6 +31,7 @@ include_rules = [
"+grit/content_resources.h",
"+grit/ui_resources.h",
"+grit/ui_strings.h",
+ "+grit/webkit_chromium_resources.h",
"+grit/webkit_resources.h",
"+grit/webkit_strings.h",
"+grit/webui_resources_map.h",
diff --git a/content/browser/gpu/test_support_gpu.gypi b/content/browser/gpu/test_support_gpu.gypi
index 4892e9a..f141069 100644
--- a/content/browser/gpu/test_support_gpu.gypi
+++ b/content/browser/gpu/test_support_gpu.gypi
@@ -29,6 +29,7 @@
'<(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': [
['win_use_allocator_shim==1', {
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 4ffff1a..4bc7aaf 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -320,6 +320,7 @@
'<(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
index 85a2fe6..76468fa 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -896,6 +896,7 @@
# 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',
],
'dependencies': [
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index 0e6b848..8000821 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -66,6 +66,9 @@
"chrome_frame/resources/chrome_frame_resources.grd": {
"includes": [8000],
},
+ "third_party/WebKit/Source/WebKit/chromium/WebKit.grd": {
+ "includes": [8500],
+ },
"ui/base/strings/app_locale_settings.grd": {
"messages": [9000],
},
diff --git a/webkit/child/webkitplatformsupport_impl.cc b/webkit/child/webkitplatformsupport_impl.cc
index ccd988a..364429d 100644
--- a/webkit/child/webkitplatformsupport_impl.cc
+++ b/webkit/child/webkitplatformsupport_impl.cc
@@ -26,7 +26,7 @@
#include "base/synchronization/lock.h"
#include "base/time/time.h"
#include "content/public/common/webplugininfo.h"
-#include "grit/blink_resources.h"
+#include "grit/webkit_chromium_resources.h"
#include "grit/webkit_resources.h"
#include "grit/webkit_strings.h"
#include "net/base/data_url.h"
diff --git a/webkit/common/cursors/webcursor_mac.mm b/webkit/common/cursors/webcursor_mac.mm
index 1a1dc44..0abc3e9 100644
--- a/webkit/common/cursors/webcursor_mac.mm
+++ b/webkit/common/cursors/webcursor_mac.mm
@@ -9,7 +9,7 @@
#include "base/logging.h"
#include "base/mac/mac_util.h"
#include "base/mac/scoped_cftyperef.h"
-#include "grit/blink_resources.h"
+#include "grit/webkit_chromium_resources.h"
#include "skia/ext/skia_utils_mac.h"
#include "third_party/WebKit/public/platform/WebSize.h"
#include "third_party/WebKit/public/web/WebCursorInfo.h"
diff --git a/webkit/support/platform_support_win.cc b/webkit/support/platform_support_win.cc
index 58d78be..f2585fe 100644
--- a/webkit/support/platform_support_win.cc
+++ b/webkit/support/platform_support_win.cc
@@ -12,7 +12,7 @@
#include "base/strings/string16.h"
#include "base/strings/string_piece.h"
#include "base/win/resource_util.h"
-#include "grit/blink_resources.h"
+#include "grit/webkit_chromium_resources.h"
#include "grit/webkit_resources.h"
#include "ui/base/resource/resource_bundle.h"
#include "webkit/support/test_webkit_platform_support.h"
diff --git a/webkit/webkit_resources.gyp b/webkit/webkit_resources.gyp
index 8ce53a7..50f795e 100644
--- a/webkit/webkit_resources.gyp
+++ b/webkit/webkit_resources.gyp
@@ -19,6 +19,13 @@
'includes': [ '../build/grit_action.gypi' ],
},
{
+ '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',
generated by cgit v1.1 at 2025-02-11 16:06:30 +0000