diff options
Diffstat (limited to 'content/shell/renderer')
3 files changed, 17 insertions, 23 deletions
diff --git a/content/shell/renderer/layout_test/layout_test_render_process_observer.cc b/content/shell/renderer/layout_test/layout_test_render_process_observer.cc index d62ae58..0ca0149 100644 --- a/content/shell/renderer/layout_test/layout_test_render_process_observer.cc +++ b/content/shell/renderer/layout_test/layout_test_render_process_observer.cc @@ -43,26 +43,7 @@ LayoutTestRenderProcessObserver::LayoutTestRenderProcessObserver() g_instance = this; RenderThread::Get()->AddObserver(this); EnableRendererLayoutTestMode(); -} - -LayoutTestRenderProcessObserver::~LayoutTestRenderProcessObserver() { - CHECK(g_instance == this); - g_instance = NULL; -} - -void LayoutTestRenderProcessObserver::SetTestDelegate( - test_runner::WebTestDelegate* delegate) { - test_interfaces_->SetDelegate(delegate); - test_delegate_ = delegate; -} - -void LayoutTestRenderProcessObserver::SetMainWindow(RenderView* view) { - BlinkTestRunner* test_runner = BlinkTestRunner::Get(view); - test_interfaces_->SetWebView(view->GetWebView(), test_runner->proxy()); - main_test_runner_ = test_runner; -} -void LayoutTestRenderProcessObserver::WebKitInitialized() { // We always expose GC to layout tests. std::string flags("--expose-gc"); v8::V8::SetFlagsFromString(flags.c_str(), static_cast<int>(flags.size())); @@ -85,6 +66,23 @@ void LayoutTestRenderProcessObserver::WebKitInitialized() { } } +LayoutTestRenderProcessObserver::~LayoutTestRenderProcessObserver() { + CHECK(g_instance == this); + g_instance = NULL; +} + +void LayoutTestRenderProcessObserver::SetTestDelegate( + test_runner::WebTestDelegate* delegate) { + test_interfaces_->SetDelegate(delegate); + test_delegate_ = delegate; +} + +void LayoutTestRenderProcessObserver::SetMainWindow(RenderView* view) { + BlinkTestRunner* test_runner = BlinkTestRunner::Get(view); + test_interfaces_->SetWebView(view->GetWebView(), test_runner->proxy()); + main_test_runner_ = test_runner; +} + void LayoutTestRenderProcessObserver::OnRenderProcessShutdown() { test_interfaces_.reset(); } diff --git a/content/shell/renderer/layout_test/layout_test_render_process_observer.h b/content/shell/renderer/layout_test/layout_test_render_process_observer.h index 062ea5e..2787409 100644 --- a/content/shell/renderer/layout_test/layout_test_render_process_observer.h +++ b/content/shell/renderer/layout_test/layout_test_render_process_observer.h @@ -37,7 +37,6 @@ class LayoutTestRenderProcessObserver : public RenderProcessObserver { void SetMainWindow(RenderView* view); // RenderProcessObserver implementation. - void WebKitInitialized() override; void OnRenderProcessShutdown() override; bool OnControlMessageReceived(const IPC::Message& message) override; diff --git a/content/shell/renderer/shell_content_renderer_client.cc b/content/shell/renderer/shell_content_renderer_client.cc index c799904..c1d501c 100644 --- a/content/shell/renderer/shell_content_renderer_client.cc +++ b/content/shell/renderer/shell_content_renderer_client.cc @@ -6,7 +6,6 @@ #include "base/command_line.h" #include "components/web_cache/renderer/web_cache_render_process_observer.h" -#include "content/public/renderer/render_thread.h" #include "content/shell/renderer/shell_render_view_observer.h" #include "third_party/WebKit/public/web/WebView.h" #include "v8/include/v8.h" @@ -23,9 +22,7 @@ ShellContentRendererClient::~ShellContentRendererClient() { } void ShellContentRendererClient::RenderThreadStarted() { - RenderThread* thread = RenderThread::Get(); web_cache_observer_.reset(new web_cache::WebCacheRenderProcessObserver()); - thread->AddObserver(web_cache_observer_.get()); } void ShellContentRendererClient::RenderViewCreated(RenderView* render_view) { |