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

Unified Diff: content/renderer/render_view_impl.h

Issue 2479663002: Move compositor InputHandler from RenderViewImpl to RenderWidget. (Closed)
Patch Set: dcheng@'s suggestions, replumb enable_scroll_animator. Created 4 years, 1 month 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/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index c2435b92749f4d355cdfddab4a268706c49d296e..35cef5163650fbaa356bd3a87c4bace6c284ea84 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -18,7 +18,6 @@
#include "base/gtest_prod_util.h"
#include "base/id_map.h"
#include "base/macros.h"
-#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "base/process/process.h"
#include "base/strings/string16.h"
@@ -126,8 +125,7 @@ class CONTENT_EXPORT RenderViewImpl
: public RenderWidget,
NON_EXPORTED_BASE(public blink::WebViewClient),
public RenderWidgetOwnerDelegate,
- public RenderView,
- public base::SupportsWeakPtr<RenderViewImpl> {
+ public RenderView {
public:
// Creates a new RenderView. |opener_id| is the routing ID of the RenderView
// responsible for creating this RenderView. Note that if the original opener
@@ -216,7 +214,7 @@ class CONTENT_EXPORT RenderViewImpl
void AttachWebFrameWidget(blink::WebFrameWidget* frame_widget);
void TransferActiveWheelFlingAnimation(
- const blink::WebActiveWheelFlingParameters& params);
+ const blink::WebActiveWheelFlingParameters& params) override;
// Starts a timer to send an UpdateState message on behalf of |frame|, if the
// timer isn't already running. This allows multiple state changing events to
@@ -614,7 +612,7 @@ class CONTENT_EXPORT RenderViewImpl
// Launch an Android content intent with the given URL.
void LaunchAndroidContentIntent(const GURL& intent_url,
size_t request_id,
- bool is_main_frame);
+ bool is_main_frame) override;
#endif
#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MACOSX))
@@ -865,8 +863,6 @@ class CONTENT_EXPORT RenderViewImpl
typedef std::map<cc::SharedBitmapId, cc::SharedBitmap*> BitmapMap;
BitmapMap disambiguation_bitmaps_;
- bool has_added_input_handler_;
-
// ---------------------------------------------------------------------------
// ADDING NEW DATA? Please see if it fits appropriately in one of the above
// sections rather than throwing it randomly at the end. If you're adding a

Powered by Google App Engine
This is Rietveld 408576698