| Index: content/renderer/render_view_impl.h
|
| diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
|
| index e379b7e4ff1c056451b15ca432463371809f6e59..491a00be70e05303cf7c74ae3dfcc3aec5542274 100644
|
| --- a/content/renderer/render_view_impl.h
|
| +++ b/content/renderer/render_view_impl.h
|
| @@ -18,6 +18,7 @@
|
| #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"
|
| @@ -121,7 +122,8 @@
|
| : public RenderWidget,
|
| NON_EXPORTED_BASE(public blink::WebViewClient),
|
| public RenderWidgetOwnerDelegate,
|
| - public RenderView {
|
| + public RenderView,
|
| + public base::SupportsWeakPtr<RenderViewImpl> {
|
| public:
|
| // Creates a new RenderView. Note that if the original opener has been closed,
|
| // |params.window_was_created_with_opener| will be true and
|
| @@ -211,7 +213,7 @@
|
| void AttachWebFrameWidget(blink::WebFrameWidget* frame_widget);
|
|
|
| void TransferActiveWheelFlingAnimation(
|
| - const blink::WebActiveWheelFlingParameters& params) override;
|
| + const blink::WebActiveWheelFlingParameters& params);
|
|
|
| // 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
|
| @@ -392,10 +394,6 @@
|
| // appropriate section, add it there. If not, there are some random functions
|
| // nearer to the top you can add it to.
|
|
|
| - base::WeakPtr<RenderViewImpl> GetWeakPtr() {
|
| - return weak_ptr_factory_.GetWeakPtr();
|
| - }
|
| -
|
| protected:
|
| // RenderWidget overrides:
|
| blink::WebWidget* GetWebWidget() const override;
|
| @@ -835,6 +833,8 @@
|
| 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
|
| @@ -844,8 +844,6 @@
|
| // notifications.
|
| // ---------------------------------------------------------------------------
|
|
|
| - base::WeakPtrFactory<RenderViewImpl> weak_ptr_factory_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
|
| };
|
|
|
|
|