Chromium Code Reviews| Index: chrome/browser/renderer_host/render_widget_host_view_views_touch.cc |
| diff --git a/chrome/browser/renderer_host/render_widget_host_view_views_touch.cc b/chrome/browser/renderer_host/render_widget_host_view_views_touch.cc |
| index 27f769ea5f43fbefc4103c1b86ecc4f0c63e785b..ed9d209a00ae3a45efb3399d42bce949efef3706 100644 |
| --- a/chrome/browser/renderer_host/render_widget_host_view_views_touch.cc |
| +++ b/chrome/browser/renderer_host/render_widget_host_view_views_touch.cc |
| @@ -197,12 +197,22 @@ gfx::PluginWindowHandle RenderWidgetHostViewViews::GetCompositingSurface() { |
| return 1; |
| } |
| -void RenderWidgetHostViewViews::AcceleratedSurfaceSetIOSurface( |
| - int32 width, int32 height, uint64 surface_id) { |
| - accelerated_surface_containers_[surface_id] = |
| - AcceleratedSurfaceContainerTouch::CreateAcceleratedSurfaceContainer( |
| - gfx::Size(width, height), |
| - surface_id); |
| +void RenderWidgetHostViewViews::AcceleratedSurfaceNew( |
| + int32 width, |
| + int32 height, |
| + uint64* surface_id, |
| + TransportDIB::Handle* surface_handle) { |
| + AcceleratedSurfaceContainerTouch* surface = |
|
sky
2011/09/21 21:39:55
Use a scoped_ptr or scoped_refptr.
|
| + AcceleratedSurfaceContainerTouch::CreateAcceleratedSurfaceContainer( |
| + gfx::Size(width, height)); |
| + if (!surface->Initialize(surface_id)) { |
| + LOG(ERROR) << "Failed to create AcceleratedSurfaceContainer"; |
| + delete surface; |
| + return; |
| + } |
| + *surface_handle = surface->handle(); |
| + |
| + accelerated_surface_containers_[*surface_id] = surface; |
| } |
| void RenderWidgetHostViewViews::AcceleratedSurfaceRelease(uint64 surface_id) { |