summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/chrome_dll.vcproj2
-rwxr-xr-xchrome/chrome.sln16
-rw-r--r--chrome/chrome_kjs.sln18
-rw-r--r--tools/grit/grit/format/rc.py3
-rw-r--r--tools/grit/grit/node/include.py1
-rw-r--r--webkit/SConscript1
-rw-r--r--webkit/default_plugin/plugin_impl.cc1
-rw-r--r--webkit/glue/chromium_bridge_impl.cc4
-rw-r--r--webkit/glue/feed_preview.cc4
-rw-r--r--webkit/glue/webcursor_win.cc4
-rwxr-xr-xwebkit/glue/webkit_resources.grd40
-rw-r--r--webkit/glue/webkit_resources.h31
-rw-r--r--webkit/glue/webkit_resources.rc43
-rw-r--r--webkit/tools/test_shell/test_shell.cc4
-rw-r--r--webkit/tools/test_shell/test_shell.vcproj2
-rw-r--r--webkit/tools/test_shell/test_shell_mac.mm1
-rw-r--r--webkit/webkit.sln12
-rwxr-xr-xwebkit/webkit.xcodeproj/glue_prebuild.sh8
-rw-r--r--webkit/webkit_armu.sln12
-rw-r--r--webkit/webkit_kjs.sln12
20 files changed, 137 insertions, 82 deletions
diff --git a/chrome/app/chrome_dll.vcproj b/chrome/app/chrome_dll.vcproj
index b61d3cd..d98b7c0 100644
--- a/chrome/app/chrome_dll.vcproj
+++ b/chrome/app/chrome_dll.vcproj
@@ -224,7 +224,7 @@
>
</File>
<File
- RelativePath="..\..\webkit\glue\webkit_resources.rc"
+ RelativePath="$(OutDir)\grit_derived_sources\webkit_resources.rc"
>
</File>
<File
diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index ba07631..9542642 100755
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -90,6 +90,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glue", "..\webkit\build\glu
Release.AspNetCompiler.Debug = "False"
EndProjectSection
ProjectSection(ProjectDependencies) = postProject
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9}
{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
@@ -1956,6 +1957,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_resources", "..\net\bui
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webkit_resources", "..\webkit\build\webkit_resources\webkit_resources.vcproj", "{0B469837-3D46-484A-AFB3-C5A6C68730B9}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -1996,6 +2003,14 @@ Global
{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Mixed Platforms.Build.0 = Release|Win32
{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Win32.ActiveCfg = Release|Win32
{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Win32.Build.0 = Release|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Win32.ActiveCfg = Debug|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Win32.Build.0 = Debug|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Win32.ActiveCfg = Release|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Win32.Build.0 = Release|Win32
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -3183,6 +3198,7 @@ Global
{032541FB-1E7C-4423-B657-4A71FE180C8A} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
{0E5474AC-5996-4B13-87C0-4AE931EE0815} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
diff --git a/chrome/chrome_kjs.sln b/chrome/chrome_kjs.sln
index c9ec7380..29fe95c 100644
--- a/chrome/chrome_kjs.sln
+++ b/chrome/chrome_kjs.sln
@@ -90,6 +90,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glue", "..\webkit\build\glu
Release.AspNetCompiler.Debug = "False"
EndProjectSection
ProjectSection(ProjectDependencies) = postProject
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9}
{2BCD6193-D243-422C-BB1A-BC219BF147B3} = {2BCD6193-D243-422C-BB1A-BC219BF147B3}
{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
{31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74}
@@ -1746,6 +1747,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_resources", "..\net\bui
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webkit_resources", "..\webkit\build\webkit_resources\webkit_resources.vcproj", "{0B469837-3D46-484A-AFB3-C5A6C68730B9}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -1806,6 +1813,16 @@ Global
{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Mixed Platforms.Build.0 = Release|Win32
{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Win32.ActiveCfg = Release|Win32
{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}.Release|Win32.Build.0 = Release|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Win32.ActiveCfg = Debug|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Win32.Build.0 = Debug|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Any CPU.ActiveCfg = Release|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Win32.ActiveCfg = Release|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Win32.Build.0 = Release|Win32
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Any CPU.ActiveCfg = Debug|Win32
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
@@ -3115,6 +3132,7 @@ Global
{018D4F38-6272-448F-A864-976DA09F05D0} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
{0E5474AC-5996-4B13-87C0-4AE931EE0815} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
diff --git a/tools/grit/grit/format/rc.py b/tools/grit/grit/format/rc.py
index 2da976a..1ce7772 100644
--- a/tools/grit/grit/format/rc.py
+++ b/tools/grit/grit/format/rc.py
@@ -405,6 +405,9 @@ class RcInclude(interface.ItemFormatter):
def Format(self, item, lang='en', begin_item=True, output_dir='.'):
if not begin_item:
return ''
+
+ if item.attrs['headeronly'] == 'true':
+ return ''
assert isinstance(lang, types.StringTypes)
from grit.node import structure
diff --git a/tools/grit/grit/node/include.py b/tools/grit/grit/node/include.py
index 67a05ac..a62445b 100644
--- a/tools/grit/grit/node/include.py
+++ b/tools/grit/grit/node/include.py
@@ -27,6 +27,7 @@ class IncludeNode(base.Node):
'generateid': 'true',
'filenameonly': 'false',
'relativepath': 'false',
+ 'headeronly': 'false',
}
def ItemFormatter(self, t):
diff --git a/webkit/SConscript b/webkit/SConscript
index 1bf5fa3..8c9a4b0 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -227,6 +227,7 @@ sconscript_dirs = env.ChromiumLoadComponentSConscripts(
JavaScriptCore_pcre = 'SConscript.javascriptcore_pcre',
WebCore_config_h = 'build/JSConfig/SConscript',
JavaScriptCore = 'build/JavaScriptCore/SConscript',
+ webkit_resources = 'build/webkit_resources/SConscript',
webkit_strings = 'build/localized_strings/SConscript',
bindings = 'build/port/SConscript',
V8Bindings = 'build/V8Bindings/SConscript',
diff --git a/webkit/default_plugin/plugin_impl.cc b/webkit/default_plugin/plugin_impl.cc
index fcf1744..c0f99b4 100644
--- a/webkit/default_plugin/plugin_impl.cc
+++ b/webkit/default_plugin/plugin_impl.cc
@@ -18,7 +18,6 @@
#include "webkit/default_plugin/default_plugin_shared.h"
#include "webkit/default_plugin/plugin_main.h"
#include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/webkit_resources.h"
// This file is generated when the webkit_strings.grd file is compiled.
// The path is the chrome/webkit/<debug\release>/obj/localized_strings
// folder. This path is added to the include path in the associated vsprops
diff --git a/webkit/glue/chromium_bridge_impl.cc b/webkit/glue/chromium_bridge_impl.cc
index fe18543..48d2485 100644
--- a/webkit/glue/chromium_bridge_impl.cc
+++ b/webkit/glue/chromium_bridge_impl.cc
@@ -47,10 +47,12 @@
#include "webkit/glue/webcursor.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/glue/webplugin_impl.h"
-#include "webkit/glue/webkit_resources.h"
#include "webkit/glue/webview_impl.h"
#include "webkit/glue/webview_delegate.h"
+// Generated by GRIT
+#include "webkit_resources.h"
+
#if defined(OS_WIN)
#include <windows.h>
#include <vssym32.h>
diff --git a/webkit/glue/feed_preview.cc b/webkit/glue/feed_preview.cc
index f7ad688..5d6962b 100644
--- a/webkit/glue/feed_preview.cc
+++ b/webkit/glue/feed_preview.cc
@@ -19,7 +19,9 @@ MSVC_POP_WARNING();
#include "base/logging.h"
#include "webkit/glue/glue_util.h"
#include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/webkit_resources.h"
+
+// Generated by GRIT
+#include "webkit_resources.h"
namespace WebCore {
diff --git a/webkit/glue/webcursor_win.cc b/webkit/glue/webcursor_win.cc
index b529e06..a31b75d 100644
--- a/webkit/glue/webcursor_win.cc
+++ b/webkit/glue/webcursor_win.cc
@@ -12,7 +12,9 @@
#include "base/pickle.h"
#include "skia/include/SkBitmap.h"
#include "webkit/glue/webcursor.h"
-#include "webkit/glue/webkit_resources.h"
+
+// Generated by GRIT
+#include "webkit_resources.h"
using WebCore::PlatformCursor;
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd
new file mode 100755
index 0000000..79c64f9c
--- /dev/null
+++ b/webkit/glue/webkit_resources.grd
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grit latest_public_release="0" current_release="1">
+ <outputs>
+ <output filename="webkit_resources.h" type="rc_header">
+ <emit emit_type='prepend'></emit>
+ </output>
+ <output filename="webkit_resources.rc" type="rc_all" />
+ </outputs>
+ <release seq="1">
+ <includes>
+ <include name="IDR_BROKENIMAGE" file="resources\broken-image.gif" type="BINDATA" />
+ <include name="IDR_TICKMARK_DASH" file="resources\dash.png" type="BINDATA" />
+ <include name="IDR_FEED_PREVIEW" file="resources\feed.html" type="BINDATA" />
+ <include name="IDR_PAN_SCROLL_ICON" file="resources\pan_icon.png" type="BINDATA" />
+ <include name="IDR_TEXTAREA_RESIZER" file="resources\textarea_resize_corner.png" type="BINDATA" />
+
+ <!-- The editor delete button is only used in layout tests so the
+ actual resource isn't in webkit_resources.rc. This resource
+ should not be used outside of layout tests. -->
+ <include name="IDR_EDITOR_DELETE_BUTTON" headeronly="true" file="" type="BINDATA" />
+ <include name="IDC_ALIAS" file="resources\aliasb.cur" type="CURSOR" />
+ <include name="IDC_CELL" file="resources\cell.cur" type="CURSOR" />
+ <include name="IDC_COLRESIZE" file="resources\col_resize.cur" type="CURSOR" />
+ <include name="IDC_COPYCUR" file="resources\copy.cur" type="CURSOR" />
+ <include name="IDC_ROWRESIZE" file="resources\row_resize.cur" type="CURSOR" />
+ <include name="IDC_VERTICALTEXT" file="resources\vertical_text.cur" type="CURSOR" />
+ <include name="IDC_ZOOMIN" file="resources\zoom_in.cur" type="CURSOR" />
+ <include name="IDC_ZOOMOUT" file="resources\zoom_out.cur" type="CURSOR" />
+ <include name="IDC_PAN_MIDDLE" file="resources\pan_middle.cur" type="CURSOR" />
+ <include name="IDC_PAN_NORTH" file="resources\pan_north.cur" type="CURSOR" />
+ <include name="IDC_PAN_NORTH_EAST" file="resources\pan_north_east.cur" type="CURSOR" />
+ <include name="IDC_PAN_EAST" file="resources\pan_east.cur" type="CURSOR" />
+ <include name="IDC_PAN_SOUTH_EAST" file="resources\pan_south_east.cur" type="CURSOR" />
+ <include name="IDC_PAN_SOUTH" file="resources\pan_south.cur" type="CURSOR" />
+ <include name="IDC_PAN_SOUTH_WEST" file="resources\pan_south_west.cur" type="CURSOR" />
+ <include name="IDC_PAN_WEST" file="resources\pan_west.cur" type="CURSOR" />
+ <include name="IDC_PAN_NORTH_WEST" file="resources\pan_north_west.cur" type="CURSOR" />
+ </includes>
+ </release>
+</grit> \ No newline at end of file
diff --git a/webkit/glue/webkit_resources.h b/webkit/glue/webkit_resources.h
deleted file mode 100644
index 8662778..0000000
--- a/webkit/glue/webkit_resources.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// These values shouldn't clash with other values defined in .rc files.
-// TODO(tc): Come up with a way to automate the generation of these
-// IDs so they don't collide with other rc files.
-#define IDR_BROKENIMAGE 2000
-#define IDR_TICKMARK_DASH 2001
-#define IDR_FEED_PREVIEW 2002
-#define IDR_PAN_SCROLL_ICON 2003
-#define IDR_TEXTAREA_RESIZER 2004
-
-// The editor delete button is only used in layout tests so the actual
-// resource isn't in webkit_resources.rc. This resource should not be
-// used outside of layout tests.
-#define IDR_EDITOR_DELETE_BUTTON 2005
-
-#define IDC_ALIAS 2100
-#define IDC_CELL 2101
-#define IDC_COLRESIZE 2102
-#define IDC_COPYCUR 2103
-#define IDC_ROWRESIZE 2104
-#define IDC_VERTICALTEXT 2105
-#define IDC_ZOOMIN 2106
-#define IDC_ZOOMOUT 2107
-#define IDC_PAN_MIDDLE 2108
-#define IDC_PAN_NORTH 2109
-#define IDC_PAN_NORTH_EAST 2110
-#define IDC_PAN_EAST 2111
-#define IDC_PAN_SOUTH_EAST 2112
-#define IDC_PAN_SOUTH 2113
-#define IDC_PAN_SOUTH_WEST 2114
-#define IDC_PAN_WEST 2115
-#define IDC_PAN_NORTH_WEST 2116
diff --git a/webkit/glue/webkit_resources.rc b/webkit/glue/webkit_resources.rc
deleted file mode 100644
index c99e5f6..0000000
--- a/webkit/glue/webkit_resources.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-// Resources used by webkit/*.
-//
-// Paths in this file are relative to SolutionDir.
-
-#ifdef APSTUDIO_INVOKED
- #error // Don't open in the Visual Studio resource editor!
-#endif //APSTUDIO_INVOKED
-
-#include <winuser.h>
-#include "webkit\\glue\\webkit_resources.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// data resources
-//
-
-IDR_BROKENIMAGE BINDATA "webkit\\glue\\resources\\broken-image.gif"
-IDR_TICKMARK_DASH BINDATA "webkit\\glue\\resources\\dash.png"
-IDR_FEED_PREVIEW BINDATA "webkit\\glue\\resources\\feed.html"
-IDR_PAN_SCROLL_ICON BINDATA "webkit\\glue\\resources\\pan_icon.png"
-IDR_TEXTAREA_RESIZER BINDATA "webkit\\glue\\resources\\textarea_resize_corner.png"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Cursor
-//
-IDC_ALIAS CURSOR "webkit\\glue\\resources\\aliasb.cur"
-IDC_CELL CURSOR "webkit\\glue\\resources\\cell.cur"
-IDC_COLRESIZE CURSOR "webkit\\glue\\resources\\col_resize.cur"
-IDC_COPYCUR CURSOR "webkit\\glue\\resources\\copy.cur"
-IDC_ROWRESIZE CURSOR "webkit\\glue\\resources\\row_resize.cur"
-IDC_VERTICALTEXT CURSOR "webkit\\glue\\resources\\vertical_text.cur"
-IDC_ZOOMIN CURSOR "webkit\\glue\\resources\\zoom_in.cur"
-IDC_ZOOMOUT CURSOR "webkit\\glue\\resources\\zoom_out.cur"
-IDC_PAN_MIDDLE CURSOR "webkit\\glue\\resources\\pan_middle.cur"
-IDC_PAN_NORTH CURSOR "webkit\\glue\\resources\\pan_north.cur"
-IDC_PAN_NORTH_EAST CURSOR "webkit\\glue\\resources\\pan_north_east.cur"
-IDC_PAN_EAST CURSOR "webkit\\glue\\resources\\pan_east.cur"
-IDC_PAN_SOUTH_EAST CURSOR "webkit\\glue\\resources\\pan_south_east.cur"
-IDC_PAN_SOUTH CURSOR "webkit\\glue\\resources\\pan_south.cur"
-IDC_PAN_SOUTH_WEST CURSOR "webkit\\glue\\resources\\pan_south_west.cur"
-IDC_PAN_WEST CURSOR "webkit\\glue\\resources\\pan_west.cur"
-IDC_PAN_NORTH_WEST CURSOR "webkit\\glue\\resources\\pan_north_west.cur"
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index d3433fc..f7c4697 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -29,7 +29,6 @@
#include "webkit/glue/webdatasource.h"
#include "webkit/glue/webframe.h"
#include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/webkit_resources.h"
#include "webkit/glue/webpreferences.h"
#include "webkit/glue/weburlrequest.h"
#include "webkit/glue/webview.h"
@@ -41,6 +40,9 @@
#include "SkBitmap.h"
+// Generated by GRIT
+#include "webkit_resources.h"
+
namespace {
// Default timeout in ms for file page loads when in layout test mode.
diff --git a/webkit/tools/test_shell/test_shell.vcproj b/webkit/tools/test_shell/test_shell.vcproj
index 9b55748..b652571 100644
--- a/webkit/tools/test_shell/test_shell.vcproj
+++ b/webkit/tools/test_shell/test_shell.vcproj
@@ -201,7 +201,7 @@
>
</File>
<File
- RelativePath="..\..\glue\webkit_resources.rc"
+ RelativePath="$(OutDir)\grit_derived_sources\webkit_resources.rc"
>
</File>
<File
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index 0ac7d39..3429d06 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -26,7 +26,6 @@
#include "webkit/glue/webdatasource.h"
#include "webkit/glue/webframe.h"
#include "webkit/glue/webkit_glue.h"
-#include "webkit/glue/webkit_resources.h"
#include "webkit/glue/webpreferences.h"
#include "webkit/glue/weburlrequest.h"
#include "webkit/glue/webview.h"
diff --git a/webkit/webkit.sln b/webkit/webkit.sln
index 58d59dd..f072ee0 100644
--- a/webkit/webkit.sln
+++ b/webkit/webkit.sln
@@ -12,6 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glue", "build\glue\glue.vcp
Release.AspNetCompiler.Debug = "False"
EndProjectSection
ProjectSection(ProjectDependencies) = postProject
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9}
{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
@@ -421,12 +422,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_resources", "..\net\bui
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webkit_resources", "build\webkit_resources\webkit_resources.vcproj", "{0B469837-3D46-484A-AFB3-C5A6C68730B9}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Win32.ActiveCfg = Debug|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Win32.Build.0 = Debug|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Win32.ActiveCfg = Release|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Win32.Build.0 = Release|Win32
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Win32.ActiveCfg = Debug|Win32
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Win32.Build.0 = Debug|Win32
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Win32.ActiveCfg = Release|Win32
@@ -609,6 +620,7 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{0655DC38-C685-436C-8D99-7CF64CB2CC35} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {4A249B49-19FB-4BD1-B017-718E7A4448EF}
{0E5474AC-5996-4B13-87C0-4AE931EE0815} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
{1832A374-8A74-4F9E-B536-69A699B3E165} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
diff --git a/webkit/webkit.xcodeproj/glue_prebuild.sh b/webkit/webkit.xcodeproj/glue_prebuild.sh
index fbfb30f..fd56984 100755
--- a/webkit/webkit.xcodeproj/glue_prebuild.sh
+++ b/webkit/webkit.xcodeproj/glue_prebuild.sh
@@ -18,3 +18,11 @@ then
-i "${PROJECT_DIR}/glue/webkit_strings.grd" build \
-o "${GRIT_DIR}"
fi
+
+if [ "${GRIT_DIR}/webkit_resources.h" -ot \
+ "${PROJECT_DIR}/glue/webkit_resources.grd" ]
+then
+ python "${PROJECT_DIR}/../tools/grit/grit.py" \
+ -i "${PROJECT_DIR}/glue/webkit_resources.grd" build \
+ -o "${GRIT_DIR}"
+fi
diff --git a/webkit/webkit_armu.sln b/webkit/webkit_armu.sln
index 99a7e0b..3148efa 100644
--- a/webkit/webkit_armu.sln
+++ b/webkit/webkit_armu.sln
@@ -12,6 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glue", "build\glue\glue.vcp
Release.AspNetCompiler.Debug = "False"
EndProjectSection
ProjectSection(ProjectDependencies) = postProject
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9}
{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
{2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673}
{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
@@ -395,12 +396,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_resources", "..\net\bui
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webkit_resources", "build\webkit_resources\webkit_resources.vcproj", "{0B469837-3D46-484A-AFB3-C5A6C68730B9}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Win32.ActiveCfg = Debug|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Win32.Build.0 = Debug|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Win32.ActiveCfg = Release|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Win32.Build.0 = Release|Win32
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Win32.ActiveCfg = Debug|Win32
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Win32.Build.0 = Debug|Win32
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Win32.ActiveCfg = Release|Win32
@@ -571,6 +582,7 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{0655DC38-C685-436C-8D99-7CF64CB2CC35} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {4A249B49-19FB-4BD1-B017-718E7A4448EF}
{0E5474AC-5996-4B13-87C0-4AE931EE0815} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
{1832A374-8A74-4F9E-B536-69A699B3E165} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
diff --git a/webkit/webkit_kjs.sln b/webkit/webkit_kjs.sln
index c9603cb..9653c0f 100644
--- a/webkit/webkit_kjs.sln
+++ b/webkit/webkit_kjs.sln
@@ -12,6 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glue", "build\glue\glue.vcp
Release.AspNetCompiler.Debug = "False"
EndProjectSection
ProjectSection(ProjectDependencies) = postProject
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9}
{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
{2BCD6193-D243-422C-BB1A-BC219BF147B3} = {2BCD6193-D243-422C-BB1A-BC219BF147B3}
{2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}
@@ -406,6 +407,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_resources", "..\net\bui
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webkit_resources", "build\webkit_resources\webkit_resources.vcproj", "{0B469837-3D46-484A-AFB3-C5A6C68730B9}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -416,6 +423,10 @@ Global
{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.Build.0 = Debug|Win32
{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.ActiveCfg = Release|Win32
{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.Build.0 = Release|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Win32.ActiveCfg = Debug|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Debug|Win32.Build.0 = Debug|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Win32.ActiveCfg = Release|Win32
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9}.Release|Win32.Build.0 = Release|Win32
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Win32.ActiveCfg = Debug|Win32
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Debug|Win32.Build.0 = Debug|Win32
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}.Release|Win32.ActiveCfg = Release|Win32
@@ -586,6 +597,7 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{011D10F1-B656-4A1B-A0C3-3842F02122C5} = {1DFD10B5-A673-4C3A-BA1D-3546FC4B7740}
+ {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {4BC2C9E2-78FA-446A-B6E0-85689A2B4D3D}
{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {4A249B49-19FB-4BD1-B017-718E7A4448EF}
{0E5474AC-5996-4B13-87C0-4AE931EE0815} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
{1832A374-8A74-4F9E-B536-69A699B3E165} = {2C5FC2FE-B8B0-44B9-A7C4-E5B5E7292F6B}
generated by cgit v1.1 at 2025-01-18 00:42:39 +0000