diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 14:52:50 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 14:52:50 +0000 |
| commit | 2f62beedc0fd5c90df888b211ab00a3dd29e0976 (patch) | |
| tree | d9d879d57fd3e33d5f22b19f330ca0855af3c6a2 /content/browser/renderer_host/render_widget_host.cc | |
| parent | cfe484905085bc55742da39f792a571615cb419b (diff) | |
| download | chromium_src-2f62beedc0fd5c90df888b211ab00a3dd29e0976.zip chromium_src-2f62beedc0fd5c90df888b211ab00a3dd29e0976.tar.gz chromium_src-2f62beedc0fd5c90df888b211ab00a3dd29e0976.tar.bz2 | |
Extract RenderWidgetHostView (for Chrome-like embedders) vs. RenderWidgetHostViewBase
(for content itself, and for embedders porting to other platforms).
BUG=98716
Initial commit: r121896
Reverted (aura build issue): r121898
Will reland with fix.
Review URL: http://codereview.chromium.org/9307055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/render_widget_host.cc')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc index 1a6b65e..564543d 100644 --- a/content/browser/renderer_host/render_widget_host.cc +++ b/content/browser/renderer_host/render_widget_host.cc @@ -77,10 +77,10 @@ bool ShouldCoalesceMouseWheelEvents(const WebMouseWheelEvent& last_event, RenderWidgetHost::RenderWidgetHost(content::RenderProcessHost* process, int routing_id) - : renderer_initialized_(false), + : view_(NULL), + renderer_initialized_(false), hung_renderer_delay_ms_(kHungRendererDelayMs), renderer_accessible_(false), - view_(NULL), process_(process), routing_id_(routing_id), surface_id_(0), @@ -152,7 +152,7 @@ RenderWidgetHost::~RenderWidgetHost() { } void RenderWidgetHost::SetView(RenderWidgetHostView* view) { - view_ = view; + view_ = RenderWidgetHostViewBase::FromRWHV(view); if (!view_) { GpuSurfaceTracker::Get()->SetSurfaceHandle( @@ -160,6 +160,10 @@ void RenderWidgetHost::SetView(RenderWidgetHostView* view) { } } +RenderWidgetHostView* RenderWidgetHost::view() const { + return view_; +} + gfx::NativeViewId RenderWidgetHost::GetNativeViewId() const { if (view_) return view_->GetNativeViewId(); @@ -956,7 +960,7 @@ void RenderWidgetHost::OnMsgSetTooltipText( } } if (view()) - view()->SetTooltipText(wrapped_tooltip_text); + view_->SetTooltipText(wrapped_tooltip_text); } void RenderWidgetHost::OnMsgRequestMove(const gfx::Rect& pos) { @@ -1263,7 +1267,7 @@ void RenderWidgetHost::OnMsgGetScreenInfo(gfx::NativeViewId window_id, if (view_) view_->GetScreenInfo(results); else - RenderWidgetHostView::GetDefaultScreenInfo(results); + RenderWidgetHostViewBase::GetDefaultScreenInfo(results); } void RenderWidgetHost::OnMsgGetWindowRect(gfx::NativeViewId window_id, |