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

Unified Diff: content/browser/renderer_host/render_widget_host.cc

Issue 9347042: Introduce content::RenderWidgetHostViewPort (in content/port/browser). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head. Created 8 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host.cc
diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc
index 1a5ba0e67bdc4e8e5c62972f19f37bae08db91bb..ba33b03fbc5068f5461136ba4ca8a8840962593a 100644
--- a/content/browser/renderer_host/render_widget_host.cc
+++ b/content/browser/renderer_host/render_widget_host.cc
@@ -40,6 +40,7 @@
using base::Time;
using base::TimeDelta;
using base::TimeTicks;
+using content::RenderWidgetHostViewPort;
using content::UserMetricsAction;
using WebKit::WebGestureEvent;
using WebKit::WebInputEvent;
@@ -153,7 +154,7 @@ RenderWidgetHost::~RenderWidgetHost() {
}
void RenderWidgetHost::SetView(RenderWidgetHostView* view) {
- view_ = RenderWidgetHostViewBase::FromRWHV(view);
+ view_ = RenderWidgetHostViewPort::FromRWHV(view);
if (!view_) {
GpuSurfaceTracker::Get()->SetSurfaceHandle(
@@ -854,7 +855,7 @@ void RenderWidgetHost::RejectMouseLockOrUnlockIfNecessary() {
}
bool RenderWidgetHost::IsMouseLocked() const {
- return view_ ? view_->mouse_locked() : false;
+ return view_ ? view_->IsMouseLocked() : false;
}
bool RenderWidgetHost::IsFullscreen() const {
@@ -1274,7 +1275,7 @@ void RenderWidgetHost::OnMsgGetScreenInfo(gfx::NativeViewId window_id,
if (view_)
view_->GetScreenInfo(results);
else
- RenderWidgetHostViewBase::GetDefaultScreenInfo(results);
+ RenderWidgetHostViewPort::GetDefaultScreenInfo(results);
}
void RenderWidgetHost::OnMsgGetWindowRect(gfx::NativeViewId window_id,
« no previous file with comments | « content/browser/renderer_host/render_widget_host.h ('k') | content/browser/renderer_host/render_widget_host_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698