diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 10:05:19 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 10:05:19 +0000 |
| commit | 8d6cba4c551a773707f441d5f2955948ba6b2450 (patch) | |
| tree | aaad1b50f3fb696c4f39a4dc078149b7560b8160 /content/renderer/render_thread.cc | |
| parent | 927a672386c66a29f84f622e1d1fa2f42a45be3b (diff) | |
| download | chromium_src-8d6cba4c551a773707f441d5f2955948ba6b2450.zip chromium_src-8d6cba4c551a773707f441d5f2955948ba6b2450.tar.gz chromium_src-8d6cba4c551a773707f441d5f2955948ba6b2450.tar.bz2 | |
Update Chrome to use WebKitPlatformSupport instead of WebKitClient.
Review URL: http://codereview.chromium.org/7831035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_thread.cc')
| -rw-r--r-- | content/renderer/render_thread.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc index bda81425..5dd064b 100644 --- a/content/renderer/render_thread.cc +++ b/content/renderer/render_thread.cc @@ -47,7 +47,7 @@ #include "content/renderer/render_view.h" #include "content/renderer/render_view_visitor.h" #include "content/renderer/renderer_webidbfactory_impl.h" -#include "content/renderer/renderer_webkitclient_impl.h" +#include "content/renderer/renderer_webkitplatformsupport_impl.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_platform_file.h" #include "net/base/net_errors.h" @@ -238,7 +238,7 @@ RenderThread::~RenderThread() { if (file_thread_.get()) file_thread_->Stop(); - if (webkit_client_.get()) + if (webkit_platform_support_.get()) WebKit::shutdown(); lazy_tls.Pointer()->Set(NULL); @@ -308,7 +308,7 @@ bool RenderThread::Send(IPC::Message* msg) { if (pumping_events) { if (suspend_webkit_shared_timer) - webkit_client_->SuspendSharedTimer(); + webkit_platform_support_->SuspendSharedTimer(); if (notify_webkit_of_modal_loop) WebView::willEnterModalLoop(); @@ -334,7 +334,7 @@ bool RenderThread::Send(IPC::Message* msg) { WebView::didExitModalLoop(); if (suspend_webkit_shared_timer) - webkit_client_->ResumeSharedTimer(); + webkit_platform_support_->ResumeSharedTimer(); } return rv; @@ -415,15 +415,15 @@ void RenderThread::OnDOMStorageEvent( } void RenderThread::EnsureWebKitInitialized() { - if (webkit_client_.get()) + if (webkit_platform_support_.get()) return; v8::V8::SetCounterFunction(base::StatsTable::FindLocation); v8::V8::SetCreateHistogramFunction(CreateHistogram); v8::V8::SetAddHistogramSampleFunction(AddHistogramSample); - webkit_client_.reset(new RendererWebKitClientImpl); - WebKit::initialize(webkit_client_.get()); + webkit_platform_support_.reset(new RendererWebKitPlatformSupportImpl); + WebKit::initialize(webkit_platform_support_.get()); WebScriptController::enableV8SingleThreadMode(); |