| Index: content/browser/frame_host/render_widget_host_view_child_frame.cc
|
| diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc
|
| index 99e58e81e2eecc1b2b365f3e1aa0789da5433d60..94db3314dc2e11a69ed991af13635c1433c097b1 100644
|
| --- a/content/browser/frame_host/render_widget_host_view_child_frame.cc
|
| +++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc
|
| @@ -202,21 +202,6 @@ void RenderWidgetHostViewChildFrame::UnlockCompositingSurface() {
|
| }
|
| #endif
|
|
|
| -void RenderWidgetHostViewChildFrame::AcceleratedSurfaceInitialized(int host_id,
|
| - int route_id) {
|
| -}
|
| -
|
| -void RenderWidgetHostViewChildFrame::AcceleratedSurfaceBuffersSwapped(
|
| - const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
|
| - int gpu_host_id) {
|
| - NOTREACHED();
|
| -}
|
| -
|
| -void RenderWidgetHostViewChildFrame::AcceleratedSurfacePostSubBuffer(
|
| - const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
|
| - int gpu_host_id) {
|
| -}
|
| -
|
| void RenderWidgetHostViewChildFrame::OnSwapCompositorFrame(
|
| uint32 output_surface_id,
|
| scoped_ptr<cc::CompositorFrame> frame) {
|
| @@ -309,20 +294,13 @@ bool RenderWidgetHostViewChildFrame::CanCopyToVideoFrame() const {
|
| return false;
|
| }
|
|
|
| -void RenderWidgetHostViewChildFrame::AcceleratedSurfaceSuspend() {
|
| - NOTREACHED();
|
| -}
|
| -
|
| -void RenderWidgetHostViewChildFrame::AcceleratedSurfaceRelease() {
|
| -}
|
| -
|
| bool RenderWidgetHostViewChildFrame::HasAcceleratedSurface(
|
| const gfx::Size& desired_size) {
|
| return false;
|
| }
|
|
|
| gfx::GLSurfaceHandle RenderWidgetHostViewChildFrame::GetCompositingSurface() {
|
| - return gfx::GLSurfaceHandle(gfx::kNullPluginWindow, gfx::TEXTURE_TRANSPORT);
|
| + return gfx::GLSurfaceHandle(gfx::kNullPluginWindow, gfx::NULL_TRANSPORT);
|
| }
|
|
|
| #if defined(OS_WIN)
|
|
|