diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 17:26:27 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 17:26:27 +0000 |
| commit | 380244096d42210d8fff26b7e3a1b601599db61a (patch) | |
| tree | 4d11d03f4c0a51ffabca8f9b27114be9d7a4ca3d /content/renderer/render_widget.cc | |
| parent | f07ff018676f0304c5fe099284e726ca0deb18e2 (diff) | |
| download | chromium_src-380244096d42210d8fff26b7e3a1b601599db61a.zip chromium_src-380244096d42210d8fff26b7e3a1b601599db61a.tar.gz chromium_src-380244096d42210d8fff26b7e3a1b601599db61a.tar.bz2 | |
Cleanup usage of RenderThread for code that runs under tests. Before RenderThread::current() couldn't be used since it didn't exist in tests. The new API version, content::RenderThread::Get() works in tests, so this code isn't necessary anymore.
BUG=98375
Review URL: http://codereview.chromium.org/8194001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_widget.cc')
| -rw-r--r-- | content/renderer/render_widget.cc | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index 871a476..68594e4 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -61,13 +61,12 @@ using WebKit::WebTextDirection; using WebKit::WebTouchEvent; using WebKit::WebVector; using WebKit::WebWidget; +using content::RenderThread; -RenderWidget::RenderWidget(content::RenderThread* render_thread, - WebKit::WebPopupType popup_type) +RenderWidget::RenderWidget(WebKit::WebPopupType popup_type) : routing_id_(MSG_ROUTING_NONE), webwidget_(NULL), opener_id_(MSG_ROUTING_NONE), - render_thread_(render_thread), host_window_(0), current_paint_buf_(NULL), next_paint_flags_(0), @@ -93,7 +92,7 @@ RenderWidget::RenderWidget(content::RenderThread* render_thread, animation_task_posted_(false), invalidation_task_posted_(false) { RenderProcess::current()->AddRefProcess(); - DCHECK(render_thread_); + DCHECK(RenderThread::Get()); has_disable_gpu_vsync_switch_ = CommandLine::ForCurrentProcess()->HasSwitch( switches::kDisableGpuVsync); } @@ -111,11 +110,9 @@ RenderWidget::~RenderWidget() { // static RenderWidget* RenderWidget::Create(int32 opener_id, - content::RenderThread* render_thread, WebKit::WebPopupType popup_type) { DCHECK(opener_id != MSG_ROUTING_NONE); - scoped_refptr<RenderWidget> widget(new RenderWidget(render_thread, - popup_type)); + scoped_refptr<RenderWidget> widget(new RenderWidget(popup_type)); widget->Init(opener_id); // adds reference return widget; } @@ -150,9 +147,9 @@ void RenderWidget::DoInit(int32 opener_id, webwidget_ = web_widget; - bool result = render_thread_->Send(create_widget_message); + bool result = RenderThread::Get()->Send(create_widget_message); if (result) { - render_thread_->AddRoute(routing_id_, this); + RenderThread::Get()->AddRoute(routing_id_, this); // Take a reference on behalf of the RenderThread. This will be balanced // when we receive ViewMsg_Close. AddRef(); @@ -225,7 +222,7 @@ bool RenderWidget::Send(IPC::Message* message) { if (message->routing_id() == MSG_ROUTING_NONE) message->set_routing_id(routing_id_); - return render_thread_->Send(message); + return RenderThread::Get()->Send(message); } // Got a response from the browser after the renderer decided to create a new @@ -244,7 +241,7 @@ void RenderWidget::OnClose() { // Browser correspondence is no longer needed at this point. if (routing_id_ != MSG_ROUTING_NONE) { - render_thread_->RemoveRoute(routing_id_); + RenderThread::Get()->RemoveRoute(routing_id_); SetHidden(false); } @@ -1267,9 +1264,9 @@ void RenderWidget::SetHidden(bool hidden) { // The status has changed. Tell the RenderThread about it. is_hidden_ = hidden; if (is_hidden_) - render_thread_->WidgetHidden(); + RenderThread::Get()->WidgetHidden(); else - render_thread_->WidgetRestored(); + RenderThread::Get()->WidgetRestored(); } void RenderWidget::SetBackground(const SkBitmap& background) { |