summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--android_webview/android_webview.gyp2
-rw-r--r--chrome/chrome_dll.gypi2
-rw-r--r--chrome/chrome_repack_chrome.gypi2
-rw-r--r--chrome/chrome_tests.gypi8
-rw-r--r--chrome/chrome_tests_unit.gypi2
-rw-r--r--chrome/test/gpu/test_support_gpu.gypi2
-rw-r--r--content/DEPS2
-rw-r--r--content/browser/gpu/test_support_gpu.gypi2
-rw-r--r--content/content_shell.gypi2
-rw-r--r--content/content_tests.gypi2
-rw-r--r--tools/gritsettings/resource_ids8
-rw-r--r--webkit/child/webkitplatformsupport_impl.cc2
-rw-r--r--webkit/common/cursors/webcursor_mac.mm3
-rw-r--r--webkit/support/platform_support_win.cc2
-rw-r--r--webkit/webkit_resources.gyp2
15 files changed, 25 insertions, 18 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index be3202c..68669ce 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -53,7 +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
index 2534a24..c1bbe71 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -147,7 +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': [
'<(DEPTH)/third_party/wtl/include',
diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi
index a895435..33bdd8a 100644
--- a/chrome/chrome_repack_chrome.gypi
+++ b/chrome/chrome_repack_chrome.gypi
@@ -15,7 +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',
],
}],
['enable_extensions==1', {
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index dc01fa2..84b38ff 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -452,7 +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',
],
@@ -1923,7 +1923,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': [
'<(DEPTH)/third_party/wtl/include',
@@ -2161,7 +2161,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': [
'<(DEPTH)/third_party/wtl/include',
@@ -2544,7 +2544,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': [
'<(DEPTH)/third_party/wtl/include',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index c9e2941..7ce6ef9 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2331,7 +2331,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': {
'libraries': [
diff --git a/chrome/test/gpu/test_support_gpu.gypi b/chrome/test/gpu/test_support_gpu.gypi
index 083c0e3..7a96dc3 100644
--- a/chrome/test/gpu/test_support_gpu.gypi
+++ b/chrome/test/gpu/test_support_gpu.gypi
@@ -59,7 +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': [
['win_use_allocator_shim==1', {
diff --git a/content/DEPS b/content/DEPS
index 11aa6bd..08aa6db 100644
--- a/content/DEPS
+++ b/content/DEPS
@@ -27,10 +27,10 @@ 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",
+ "+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..9ec697b 100644
--- a/content/browser/gpu/test_support_gpu.gypi
+++ b/content/browser/gpu/test_support_gpu.gypi
@@ -28,7 +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': [
['win_use_allocator_shim==1', {
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index e2fe149..129c2a2 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -319,7 +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
index 2353ec1..dd31481 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -899,7 +899,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',
],
'dependencies': [
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index 921b714..fdab9ca 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -66,9 +66,15 @@
"chrome_frame/resources/chrome_frame_resources.grd": {
"includes": [8000],
},
- "third_party/WebKit/public/blink_resources.grd": {
+ # 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],
},
diff --git a/webkit/child/webkitplatformsupport_impl.cc b/webkit/child/webkitplatformsupport_impl.cc
index 5b320d1..e33938e 100644
--- a/webkit/child/webkitplatformsupport_impl.cc
+++ b/webkit/child/webkitplatformsupport_impl.cc
@@ -27,7 +27,7 @@
#include "base/sys_info.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 fc425ed..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"
@@ -17,6 +17,7 @@
#include "ui/gfx/point_conversions.h"
#include "ui/gfx/size_conversions.h"
+
using WebKit::WebCursorInfo;
using WebKit::WebSize;
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..3d486e9 100644
--- a/webkit/webkit_resources.gyp
+++ b/webkit/webkit_resources.gyp
@@ -21,7 +21,7 @@
{
'action_name': 'blink_chromium_resources',
'variables': {
- 'grit_grd_file': '../third_party/WebKit/public/blink_resources.grd',
+ 'grit_grd_file': '../third_party/WebKit/Source/WebKit/chromium/WebKit.grd',
},
'includes': [ '../build/grit_action.gypi' ],
},
generated by cgit v1.1 at 2025-03-02 09:53:39 +0000