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

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

Issue 1410313006: Separate RenderViewHost from RenderWidgetHost, part 5: move calls to the RenderWidgetHostDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no functionality change Created 5 years, 2 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_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index cc7def8580adc072b2a0119b72d1e6b8d12fdabf..49ed32437af851422632d5ba8af02d34a6fcc30e 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -565,7 +565,8 @@ bool RenderWidgetHostImpl::GetResizeParams(
*resize_params = ViewMsg_Resize_Params();
GetWebScreenInfo(&resize_params->screen_info);
- resize_params->resizer_rect = GetRootWindowResizerRect();
+ if (delegate_)
+ resize_params->resizer_rect = delegate_->GetRootWindowResizerRect(this);
if (view_) {
resize_params->new_size = view_->GetRequestedRendererSize();
@@ -1096,7 +1097,8 @@ void RenderWidgetHostImpl::ForwardKeyboardEvent(
if (key_event.type == WebKeyboardEvent::Char &&
(key_event.windowsKeyCode == ui::VKEY_RETURN ||
key_event.windowsKeyCode == ui::VKEY_SPACE)) {
- OnUserGesture();
+ if (delegate_)
+ delegate_->OnUserGesture(this);
}
// Double check the type to make sure caller hasn't sent us nonsense that
@@ -1367,17 +1369,6 @@ void RenderWidgetHostImpl::ImeCancelComposition() {
std::vector<blink::WebCompositionUnderline>(), 0, 0));
}
-gfx::Rect RenderWidgetHostImpl::GetRootWindowResizerRect() const {
- return gfx::Rect();
-}
-
-void RenderWidgetHostImpl::RequestToLockMouse(bool user_gesture,
- bool last_unlocked_by_target) {
- // Directly reject to lock the mouse. Subclass can override this method to
- // decide whether to allow mouse lock or not.
- GotResponseToLockMouseRequest(false);
-}
-
void RenderWidgetHostImpl::RejectMouseLockOrUnlockIfNecessary() {
DCHECK(!pending_mouse_lock_request_ || !IsMouseLocked());
if (pending_mouse_lock_request_) {
@@ -1432,13 +1423,15 @@ void RenderWidgetHostImpl::RendererIsUnresponsive() {
Source<RenderWidgetHost>(this),
NotificationService::NoDetails());
is_unresponsive_ = true;
- NotifyRendererUnresponsive();
+ if (delegate_)
+ delegate_->RendererUnresponsive(this);
}
void RenderWidgetHostImpl::RendererIsResponsive() {
if (is_unresponsive_) {
is_unresponsive_ = false;
- NotifyRendererResponsive();
+ if (delegate_)
+ delegate_->RendererResponsive(this);
}
}
@@ -1736,7 +1729,13 @@ void RenderWidgetHostImpl::OnLockMouse(bool user_gesture,
// Directly approve to lock the mouse.
GotResponseToLockMouseRequest(true);
} else {
- RequestToLockMouse(user_gesture, last_unlocked_by_target);
+ if (delegate_) {
+ delegate_->RequestToLockMouse(this, user_gesture,
+ last_unlocked_by_target);
+ return;
+ }
+ // If there's no delegate, just reject it.
+ GotResponseToLockMouseRequest(false);
}
}
@@ -1852,7 +1851,8 @@ InputEventAckState RenderWidgetHostImpl::FilterInputEvent(
if (event.type == WebInputEvent::MouseDown ||
event.type == WebInputEvent::GestureTapDown) {
- OnUserGesture();
+ if (delegate_)
+ delegate_->OnUserGesture(this);
}
if (delegate_) {
@@ -1986,10 +1986,6 @@ bool RenderWidgetHostImpl::IgnoreInputEvents() const {
return ignore_input_events_ || process_->IgnoreInputEvents();
}
-void RenderWidgetHostImpl::StartUserGesture() {
- OnUserGesture();
-}
-
void RenderWidgetHostImpl::SetBackgroundOpaque(bool opaque) {
Send(new ViewMsg_SetBackgroundOpaque(GetRoutingID(), opaque));
}
@@ -2070,7 +2066,8 @@ void RenderWidgetHostImpl::DelayedAutoResized() {
if (!auto_resize_enabled_)
return;
- OnRenderAutoResized(new_size);
+ if (delegate_)
+ delegate_->ResizeDueToAutoResize(this, new_size);
}
void RenderWidgetHostImpl::DetachDelegate() {

Powered by Google App Engine
This is Rietveld 408576698