From f6ae86398d3005224d9f31ed834c62c92b7fbe27 Mon Sep 17 00:00:00 2001 From: "ananta@chromium.org" Date: Wed, 15 May 2013 22:39:48 +0000 Subject: Relanding this as the previous attempt failed due to build errors. This is continuation of the ongoing work for bug https://code.google.com/p/chromium/issues/detail?can=2&q=237249 which is splitting chrome.dll into a browser and renderer component due to build issues on Windows. Changes in this CL as below:- 1 Move the plugins sources out of the webkit glue target into a new target 'plugins' which creates a static lib/dll depending on the component build flag. This target is specified by the newly added webkit_plugins.gypi file in the webkit\plugins folder. This is included by webkit_support.gyp. The motivation for moving the plugins out to an independent target is to enable the chrome browser code to link to the plugins without depending on glue. 2. We have a plugins_common target in webkit_plugins.gypi which builds a static lib and contains common plugin functionality like plugin_utils, webplugininfo, etc. Next step is to move the plugin list sources to this common target as we want to avoid browser to depend on Webkit through plugins. That would need some code changes which I wanted to avoid in this CL. 3. The 'glue' target in webkit_glue.gypi currently depends on webkit_media which sadly depends on plugins because of the HTML5 DRM code. I moved files which are needed by plugins and other consumers like browsers into a static lib target 'glue_common' 'glue' now depends on 'glue_common' and 'plugins'. 'plugins' depends on 'glue_common'. 4. The other targets like 'renderer', etc also depend on 'glue_common'. Will move the common plugin files to the newly added webkit common folder in an upcoming CL. BUG=237249 TBR=cpu@chromium.org, darin@chromium.org, jamesr@chromium.org Review URL: https://codereview.chromium.org/14720012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200375 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/webkit_glue.cc | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'webkit/glue/webkit_glue.cc') diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index 59c5d8f..c8796cb 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -84,9 +84,6 @@ static const char kFileTestPrefix[] = "(file test):"; namespace webkit_glue { -// Global variable used by the plugin quirk "die after unload". -bool g_forcefully_terminate_plugin_process = false; - void SetJavaScriptFlags(const std::string& str) { v8::V8::SetFlagsFromString(str.data(), static_cast(str.size())); } @@ -160,14 +157,6 @@ void PlatformFileInfoToWebFileInfo( web_file_info->type = WebKit::WebFileInfo::TypeFile; } -void SetForcefullyTerminatePluginProcess(bool value) { - g_forcefully_terminate_plugin_process = value; -} - -bool ShouldForcefullyTerminatePluginProcess() { - return g_forcefully_terminate_plugin_process; -} - WebCanvas* ToWebCanvas(skia::PlatformCanvas* canvas) { return canvas; } -- cgit v1.1