Index: content/browser/renderer_host/render_widget_host_view_mac.mm |
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm |
index 0d4d03c62753f372b4be9785336c1a6b955044b7..9785c559e6bc2c4469af8ac1b63045aa6e3eb82e 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm |
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm |
@@ -1365,22 +1365,6 @@ bool RenderWidgetHostViewMac::GetCachedFirstRectForCharacterRange( |
return true; |
} |
-void RenderWidgetHostViewMac::AcceleratedSurfaceBuffersSwapped( |
- const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, |
- int gpu_host_id) { |
-} |
- |
-void RenderWidgetHostViewMac::AcceleratedSurfacePostSubBuffer( |
- const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params, |
- int gpu_host_id) { |
-} |
- |
-void RenderWidgetHostViewMac::AcceleratedSurfaceSuspend() { |
-} |
- |
-void RenderWidgetHostViewMac::AcceleratedSurfaceRelease() { |
-} |
- |
bool RenderWidgetHostViewMac::HasAcceleratedSurface( |
const gfx::Size& desired_size) { |
if (browser_compositor_view_) |
@@ -1425,10 +1409,6 @@ void RenderWidgetHostViewMac::OnSwapCompositorFrame( |
} |
} |
-void RenderWidgetHostViewMac::AcceleratedSurfaceInitialized(int host_id, |
- int route_id) { |
-} |
- |
void RenderWidgetHostViewMac::GetScreenInfo(blink::WebScreenInfo* results) { |
*results = GetWebScreenInfo(GetNativeView()); |
} |
@@ -1448,7 +1428,7 @@ gfx::Rect RenderWidgetHostViewMac::GetBoundsInRootWindow() { |
gfx::GLSurfaceHandle RenderWidgetHostViewMac::GetCompositingSurface() { |
// TODO(kbr): may be able to eliminate PluginWindowHandle argument |
// completely on Mac OS. |
- return gfx::GLSurfaceHandle(gfx::kNullPluginWindow, gfx::NATIVE_TRANSPORT); |
+ return gfx::GLSurfaceHandle(gfx::kNullPluginWindow, gfx::NULL_TRANSPORT); |
} |
bool RenderWidgetHostViewMac::LockMouse() { |
@@ -1692,13 +1672,6 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged( |
} |
- (void)dealloc { |
- // Unbind the GL context from this view. If this is not done before super's |
- // dealloc is called then the GL context will crash when it reaches into |
- // the view in its destructor. |
- // http://crbug.com/255608 |
- if (renderWidgetHostView_) |
- renderWidgetHostView_->AcceleratedSurfaceRelease(); |
- |
if (responderDelegate_ && |
[responderDelegate_ respondsToSelector:@selector(viewGone:)]) |
[responderDelegate_ viewGone:self]; |