summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webkit_glue.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-11 00:31:18 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-11 00:31:18 +0000
commit15ba07264a04a6c68a9d36b1f522e1b2dbc1c70b (patch)
treea23d185ce3e56305ba9333e2d37a00cf6ca6d48c /webkit/glue/webkit_glue.cc
parent5a3045130a5152f87f1107402ec20ca707fde7ea (diff)
downloadchromium_src-15ba07264a04a6c68a9d36b1f522e1b2dbc1c70b.zip
chromium_src-15ba07264a04a6c68a9d36b1f522e1b2dbc1c70b.tar.gz
chromium_src-15ba07264a04a6c68a9d36b1f522e1b2dbc1c70b.tar.bz2
Revert 199560 "Move the plugins sources out of the webkit glue t..."
> 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 added webkit_plugins.gypi file in the webkit\plugins folder. This is included > by webkit_support.gyp. > > 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. > > The motivation for moving the plugins out to an independent target is to enable the chrome browser code to > link to the plugins lib without depending on glue. > > We also 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 depending Webkit > through plugins. That would need some code change which I wanted to avoid in this CL. > > Will also 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/15020011 TBR=ananta@chromium.org Review URL: https://codereview.chromium.org/14646038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.cc')
-rw-r--r--webkit/glue/webkit_glue.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index c8796cb..59c5d8f 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -84,6 +84,9 @@ 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<int>(str.size()));
}
@@ -157,6 +160,14 @@ 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;
}