| Index: content/browser/renderer_host/test_render_view_host.cc
|
| diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc
|
| index 53564b3249f49e6cc72cf6a74d4b533f49383e0e..6897153e98831df72124d3cc79bb0833652b8494 100644
|
| --- a/content/browser/renderer_host/test_render_view_host.cc
|
| +++ b/content/browser/renderer_host/test_render_view_host.cc
|
| @@ -36,6 +36,28 @@ SessionStorageNamespaceImpl* CreateSessionStorageNamespace(
|
| return new SessionStorageNamespaceImpl(
|
| static_cast<DOMStorageContextImpl*>(dom_storage_context));
|
| }
|
| +
|
| +class TestCompositingDelegate
|
| + : public RenderWidgetHostViewBase::CompositingDelegate {
|
| + virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE {
|
| + return gfx::GLSurfaceHandle();
|
| + }
|
| + virtual bool ResizeNeedsNewSurface() OVERRIDE { return false; }
|
| + virtual void AcceleratedSurfaceBuffersSwapped(
|
| + const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params&
|
| + params_in_pixel,
|
| + int gpu_host_id) OVERRIDE { }
|
| + virtual void AcceleratedSurfaceNew(
|
| + int32 width_in_pixel,
|
| + int32 height_in_pixel,
|
| + uint64 surface_handle) OVERRIDE { }
|
| + virtual void AcceleratedSurfaceRelease(uint64 surface_handle) OVERRIDE { }
|
| + virtual void AcceleratedSurfacePostSubBuffer(
|
| + const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params&
|
| + params_in_pixel,
|
| + int gpu_host_id) OVERRIDE { }
|
| +};
|
| +
|
| } // namespace
|
|
|
|
|
| @@ -60,7 +82,9 @@ void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params,
|
| }
|
|
|
| TestRenderWidgetHostView::TestRenderWidgetHostView(RenderWidgetHost* rwh)
|
| - : rwh_(RenderWidgetHostImpl::From(rwh)),
|
| + : RenderWidgetHostViewBase(scoped_ptr<CompositingDelegate>(
|
| + new TestCompositingDelegate).Pass()),
|
| + rwh_(RenderWidgetHostImpl::From(rwh)),
|
| is_showing_(false) {
|
| }
|
|
|
| @@ -128,16 +152,6 @@ void TestRenderWidgetHostView::CopyFromCompositingSurface(
|
| void TestRenderWidgetHostView::OnAcceleratedCompositingStateChange() {
|
| }
|
|
|
| -void TestRenderWidgetHostView::AcceleratedSurfaceBuffersSwapped(
|
| - const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
|
| - int gpu_host_id) {
|
| -}
|
| -
|
| -void TestRenderWidgetHostView::AcceleratedSurfacePostSubBuffer(
|
| - const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
|
| - int gpu_host_id) {
|
| -}
|
| -
|
| void TestRenderWidgetHostView::AcceleratedSurfaceSuspend() {
|
| }
|
|
|
| @@ -231,10 +245,6 @@ gfx::NativeView TestRenderWidgetHostView::BuildInputMethodsGtkMenu() {
|
| }
|
| #endif // defined(TOOLKIT_GTK)
|
|
|
| -gfx::GLSurfaceHandle TestRenderWidgetHostView::GetCompositingSurface() {
|
| - return gfx::GLSurfaceHandle();
|
| -}
|
| -
|
| bool TestRenderWidgetHostView::LockMouse() {
|
| return false;
|
| }
|
|
|