Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(544)

Side by Side Diff: content/shell/renderer/shell_render_process_observer.cc

Issue 147973002: Move SetJavaScriptFlags() from webkit to content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_process_impl.cc ('k') | content/test/test_webkit_platform_support.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/renderer/shell_render_process_observer.h" 5 #include "content/shell/renderer/shell_render_process_observer.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "content/public/common/content_client.h" 8 #include "content/public/common/content_client.h"
9 #include "content/public/renderer/render_thread.h" 9 #include "content/public/renderer/render_thread.h"
10 #include "content/public/renderer/render_view.h" 10 #include "content/public/renderer/render_view.h"
11 #include "content/public/test/layouttest_support.h" 11 #include "content/public/test/layouttest_support.h"
12 #include "content/shell/common/shell_messages.h" 12 #include "content/shell/common/shell_messages.h"
13 #include "content/shell/common/shell_switches.h" 13 #include "content/shell/common/shell_switches.h"
14 #include "content/shell/renderer/shell_content_renderer_client.h" 14 #include "content/shell/renderer/shell_content_renderer_client.h"
15 #include "content/shell/renderer/test_runner/WebTestInterfaces.h" 15 #include "content/shell/renderer/test_runner/WebTestInterfaces.h"
16 #include "content/shell/renderer/webkit_test_runner.h" 16 #include "content/shell/renderer/webkit_test_runner.h"
17 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" 17 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
18 #include "third_party/WebKit/public/web/WebView.h" 18 #include "third_party/WebKit/public/web/WebView.h"
19 #include "webkit/glue/webkit_glue.h" 19 #include "v8/include/v8.h"
20 20
21 using blink::WebFrame; 21 using blink::WebFrame;
22 using blink::WebRuntimeFeatures; 22 using blink::WebRuntimeFeatures;
23 using WebTestRunner::WebTestDelegate; 23 using WebTestRunner::WebTestDelegate;
24 using WebTestRunner::WebTestInterfaces; 24 using WebTestRunner::WebTestInterfaces;
25 25
26 namespace content { 26 namespace content {
27 27
28 namespace { 28 namespace {
29 ShellRenderProcessObserver* g_instance = NULL; 29 ShellRenderProcessObserver* g_instance = NULL;
(...skipping 29 matching lines...) Expand all
59 WebKitTestRunner* test_runner = WebKitTestRunner::Get(view); 59 WebKitTestRunner* test_runner = WebKitTestRunner::Get(view);
60 test_interfaces_->setWebView(view->GetWebView(), test_runner->proxy()); 60 test_interfaces_->setWebView(view->GetWebView(), test_runner->proxy());
61 main_test_runner_ = test_runner; 61 main_test_runner_ = test_runner;
62 } 62 }
63 63
64 void ShellRenderProcessObserver::WebKitInitialized() { 64 void ShellRenderProcessObserver::WebKitInitialized() {
65 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) 65 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
66 return; 66 return;
67 67
68 // We always expose GC to layout tests. 68 // We always expose GC to layout tests.
69 webkit_glue::SetJavaScriptFlags(" --expose-gc"); 69 std::string flags("--expose-gc");
70 v8::V8::SetFlagsFromString(flags.c_str(), static_cast<int>(flags.size()));
70 71
71 if (!CommandLine::ForCurrentProcess()->HasSwitch( 72 if (!CommandLine::ForCurrentProcess()->HasSwitch(
72 switches::kStableReleaseMode)) { 73 switches::kStableReleaseMode)) {
73 WebRuntimeFeatures::enableTestOnlyFeatures(true); 74 WebRuntimeFeatures::enableTestOnlyFeatures(true);
74 } 75 }
75 76
76 test_interfaces_.reset(new WebTestInterfaces); 77 test_interfaces_.reset(new WebTestInterfaces);
77 test_interfaces_->resetAll(); 78 test_interfaces_->resetAll();
78 } 79 }
79 80
(...skipping 11 matching lines...) Expand all
91 92
92 return handled; 93 return handled;
93 } 94 }
94 95
95 void ShellRenderProcessObserver::OnSetWebKitSourceDir( 96 void ShellRenderProcessObserver::OnSetWebKitSourceDir(
96 const base::FilePath& webkit_source_dir) { 97 const base::FilePath& webkit_source_dir) {
97 webkit_source_dir_ = webkit_source_dir; 98 webkit_source_dir_ = webkit_source_dir;
98 } 99 }
99 100
100 } // namespace content 101 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_process_impl.cc ('k') | content/test/test_webkit_platform_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698