summaryrefslogtreecommitdiffstats
path: root/content/worker
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-29 05:22:09 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-29 05:22:09 +0000
commit067f519a2e675f84736aa317192bb0dc5418c123 (patch)
tree08a4a8bea4f9421c5612e2af0bb84bf0ab63ddb2 /content/worker
parent7d73f676c7a12a52236136c8681dfeb95dd550b6 (diff)
downloadchromium_src-067f519a2e675f84736aa317192bb0dc5418c123.zip
chromium_src-067f519a2e675f84736aa317192bb0dc5418c123.tar.gz
chromium_src-067f519a2e675f84736aa317192bb0dc5418c123.tar.bz2
Remove SetJavaScriptFlags() wrapper function from webkit.
This function is just an helper/wrapper function around v8::V8::SetFlagsFromString() and used only by content. John preferred to just remove the wrapper and call the v8 API directly in content. Also removing it from webkit_glue.h helps with the removal of src/webkit/ directory. BUG=265753 TEST=content_shell and content_unittests R=jochen@chromium.org, jam@chromium.org TBR=darin Review URL: https://codereview.chromium.org/147973002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
-rw-r--r--content/worker/DEPS1
-rw-r--r--content/worker/worker_thread.cc5
2 files changed, 4 insertions, 2 deletions
diff --git a/content/worker/DEPS b/content/worker/DEPS
index 24a1df50..619c5b7 100644
--- a/content/worker/DEPS
+++ b/content/worker/DEPS
@@ -1,6 +1,7 @@
include_rules = [
"+content/child",
"+sandbox/win/src",
+ "+v8/include/v8.h",
"+webkit/glue",
]
diff --git a/content/worker/worker_thread.cc b/content/worker/worker_thread.cc
index 456457c..d19701a 100644
--- a/content/worker/worker_thread.cc
+++ b/content/worker/worker_thread.cc
@@ -23,7 +23,7 @@
#include "third_party/WebKit/public/web/WebDatabase.h"
#include "third_party/WebKit/public/web/WebKit.h"
#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
-#include "webkit/glue/webkit_glue.h"
+#include "v8/include/v8.h"
using blink::WebRuntimeFeatures;
@@ -41,8 +41,9 @@ WorkerThread::WorkerThread() {
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
if (command_line.HasSwitch(switches::kJavaScriptFlags)) {
- webkit_glue::SetJavaScriptFlags(
+ std::string flags(
command_line.GetSwitchValueASCII(switches::kJavaScriptFlags));
+ v8::V8::SetFlagsFromString(flags.c_str(), static_cast<int>(flags.size()));
}
SetRuntimeFeaturesDefaultsAndUpdateFromArgs(command_line);