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

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

Issue 30683003: Remove final RenderWidgetHostImpl dependency from OverscrollController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 7 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/overscroll_controller.cc
diff --git a/content/browser/renderer_host/overscroll_controller.cc b/content/browser/renderer_host/overscroll_controller.cc
index e65cfcf348e4c3c9d4da8c920344bc72bb1a98f1..0ae3d3e25c3c9d5938e85d52c0149ebf4f3b8cb8 100644
--- a/content/browser/renderer_host/overscroll_controller.cc
+++ b/content/browser/renderer_host/overscroll_controller.cc
@@ -4,19 +4,16 @@
#include "content/browser/renderer_host/overscroll_controller.h"
+#include "base/logging.h"
#include "content/browser/renderer_host/overscroll_controller_delegate.h"
-#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/public/browser/overscroll_configuration.h"
-#include "content/public/browser/render_widget_host_view.h"
using WebKit::WebInputEvent;
namespace content {
-OverscrollController::OverscrollController(
- RenderWidgetHostImpl* render_widget_host)
- : render_widget_host_(render_widget_host),
- overscroll_mode_(OVERSCROLL_NONE),
+OverscrollController::OverscrollController()
+ : overscroll_mode_(OVERSCROLL_NONE),
scroll_state_(STATE_UNKNOWN),
overscroll_delta_x_(0.f),
overscroll_delta_y_(0.f),
@@ -145,11 +142,8 @@ bool OverscrollController::DispatchEventCompletesAction (
event.type != WebKit::WebInputEvent::GestureFlingStart)
return false;
- RenderWidgetHostView* view = render_widget_host_->GetView();
- if (!view->IsShowing())
- return false;
-
- const gfx::Rect& bounds = view->GetViewBounds();
+ DCHECK(delegate_);
+ gfx::Rect bounds = delegate_->GetVisibleBounds();
if (bounds.IsEmpty())
return false;
« no previous file with comments | « content/browser/renderer_host/overscroll_controller.h ('k') | content/browser/renderer_host/overscroll_controller_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698