diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-24 18:44:31 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-24 18:44:31 +0000 |
| commit | 41ed1938666d94c0b638cffe2e2057fe616173f1 (patch) | |
| tree | a2d5f7085d193e07f8687fb45e73d8c32b30bd75 /content/browser/renderer_host | |
| parent | 4c13243145bcb3ea39841d87bb00aee8aaa2d373 (diff) | |
| download | chromium_src-41ed1938666d94c0b638cffe2e2057fe616173f1.zip chromium_src-41ed1938666d94c0b638cffe2e2057fe616173f1.tar.gz chromium_src-41ed1938666d94c0b638cffe2e2057fe616173f1.tar.bz2 | |
Revert 208239 "Add 3 more messages to CanHandleWhileSwappedOut list"
> Add 3 more messages to CanHandleWhileSwappedOut list
>
> This CL adds the following messages to the CanHandleWhileSwappedOut list:
> ViewHostMsg_SwapCompositorFrame
> ViewHostMsg_UpdateIsDelayed
> ViewHostMsg_DidActivateAcceleratedCompositing
>
> The addition of ViewHostMsg_DidActivateAcceleratedCompositing fixes a browser and renderer state mismatch when the renderer
> stops being accelerated while swapped out.
>
> BUG=240979
> TBR=creis
> NOTRY=true
>
> Review URL: https://chromiumcodereview.appspot.com/16091008
TBR=sail@chromium.org
Review URL: https://codereview.chromium.org/17602004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208243 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host')
| -rw-r--r-- | content/browser/renderer_host/test_render_view_host.cc | 9 | ||||
| -rw-r--r-- | content/browser/renderer_host/test_render_view_host.h | 4 |
2 files changed, 1 insertions, 12 deletions
diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc index 9f12960d..cd2fbec 100644 --- a/content/browser/renderer_host/test_render_view_host.cc +++ b/content/browser/renderer_host/test_render_view_host.cc @@ -63,8 +63,7 @@ void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params, TestRenderWidgetHostView::TestRenderWidgetHostView(RenderWidgetHost* rwh) : rwh_(RenderWidgetHostImpl::From(rwh)), - is_showing_(false), - did_swap_compositor_frame_(false) { + is_showing_(false) { rwh_->SetView(this); } @@ -209,12 +208,6 @@ gfx::NativeView TestRenderWidgetHostView::BuildInputMethodsGtkMenu() { } #endif // defined(TOOLKIT_GTK) -void TestRenderWidgetHostView::OnSwapCompositorFrame( - scoped_ptr<cc::CompositorFrame> frame) { - did_swap_compositor_frame_ = true; -} - - gfx::GLSurfaceHandle TestRenderWidgetHostView::GetCompositingSurface() { return gfx::GLSurfaceHandle(); } diff --git a/content/browser/renderer_host/test_render_view_host.h b/content/browser/renderer_host/test_render_view_host.h index 6a1e558..fdaaafd 100644 --- a/content/browser/renderer_host/test_render_view_host.h +++ b/content/browser/renderer_host/test_render_view_host.h @@ -80,8 +80,6 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase { virtual GdkEventButton* GetLastMouseDown() OVERRIDE; virtual gfx::NativeView BuildInputMethodsGtkMenu() OVERRIDE; #endif // defined(TOOLKIT_GTK) - virtual void OnSwapCompositorFrame( - scoped_ptr<cc::CompositorFrame> frame) OVERRIDE; // RenderWidgetHostViewPort implementation. virtual void InitAsPopup(RenderWidgetHostView* parent_host_view, @@ -173,14 +171,12 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase { #endif bool is_showing() const { return is_showing_; } - bool did_swap_compositor_frame() const { return did_swap_compositor_frame_; } protected: RenderWidgetHostImpl* rwh_; private: bool is_showing_; - bool did_swap_compositor_frame_; }; #if defined(COMPILER_MSVC) |