diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/build/WebKit/WebKit.vcproj | 4 | ||||
| -rw-r--r-- | webkit/glue/chromium_bridge_impl.cc | 8 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.h | 5 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_webkit_init.h | 4 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 1 |
5 files changed, 9 insertions, 13 deletions
diff --git a/webkit/build/WebKit/WebKit.vcproj b/webkit/build/WebKit/WebKit.vcproj index 14fe0c7..f484d55 100644 --- a/webkit/build/WebKit/WebKit.vcproj +++ b/webkit/build/WebKit/WebKit.vcproj @@ -183,6 +183,10 @@ Name="win" > <File + RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\public\win\WebSandboxSupport.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\public\win\WebThemeEngine.h" > </File> diff --git a/webkit/glue/chromium_bridge_impl.cc b/webkit/glue/chromium_bridge_impl.cc index db8c3d8..26d7bfb 100644 --- a/webkit/glue/chromium_bridge_impl.cc +++ b/webkit/glue/chromium_bridge_impl.cc @@ -78,14 +78,6 @@ ChromeClientImpl* ToChromeClient(WebCore::Widget* widget) { namespace WebCore { -// Font ----------------------------------------------------------------------- - -#if defined(OS_WIN) -bool ChromiumBridge::ensureFontLoaded(HFONT font) { - return webkit_glue::EnsureFontLoaded(font); -} -#endif - // JavaScript ----------------------------------------------------------------- void ChromiumBridge::notifyJSOutOfMemory(Frame* frame) { diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index 6db5680..acc9ce8 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -190,11 +190,6 @@ bool GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins); // false otherwise. bool IsPluginRunningInRendererProcess(); -#if defined(OS_WIN) -// Asks the browser to load the font. -bool EnsureFontLoaded(HFONT font); -#endif - // Returns screen information corresponding to the given window. ScreenInfo GetScreenInfo(gfx::NativeViewId window); diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h index 5490f8d..4ca5ac1 100644 --- a/webkit/tools/test_shell/test_shell_webkit_init.h +++ b/webkit/tools/test_shell/test_shell_webkit_init.h @@ -42,6 +42,10 @@ class TestShellWebKitInit : public webkit_glue::WebKitClientImpl { return &mime_registry_; } + virtual WebKit::WebSandboxSupport* sandboxSupport() { + return NULL; + } + virtual uint64_t visitedLinkHash(const char* canonicalURL, size_t length) { return 0; } diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 31c0cfd..8fa13d1 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -4120,6 +4120,7 @@ }], ['OS=="win"', { 'sources': [ + '../third_party/WebKit/WebKit/chromium/public/win/WebSandboxSupport.h', '../third_party/WebKit/WebKit/chromium/public/win/WebThemeEngine.h', ], }], |