Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_android.cc |
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc |
| index 1248e9139129d520358c33f1df3875344bcdd037..847f1602a61b07249483fa33aecc0a883405aa7f 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
| @@ -17,6 +17,8 @@ |
| #include "content/common/android/device_info.h" |
| #include "content/common/gpu/gpu_messages.h" |
| #include "content/common/view_messages.h" |
| +#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" |
| +#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorSupport.h" |
| #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" |
| namespace content { |
| @@ -313,11 +315,15 @@ void RenderWidgetHostViewAndroid::AcceleratedSurfaceBuffersSwapped( |
| if (((gfx::Size)texture_layer_->layer()->bounds()).IsEmpty()) |
| texture_layer_->layer()->setBounds( |
| DrawDelegateImpl::GetInstance()->GetBounds()); |
| - DrawDelegateImpl::GetInstance()->OnSurfaceUpdated( |
| - params.surface_handle, |
| - this, |
| - base::Bind(&RenderWidgetHostImpl::AcknowledgeBufferPresent, |
| - params.route_id, gpu_host_id)); |
| + |
| + // TODO(sievers): When running the impl thread in the browser we |
| + // need to delay the ACK until after commit. |
| + DCHECK(!WebKit::Platform::current()->compositorSupport()-> |
| + isThreadingEnabled()); |
| + uint32 sync_point = |
| + ImageTransportFactoryAndroid::GetInstance()->InsertSyncPoint(); |
|
no sievers
2012/10/12 21:33:07
@piman: One thing: Isn't it a problem that I inser
|
| + RenderWidgetHostImpl::AcknowledgeBufferPresent( |
| + params.route_id, gpu_host_id, sync_point); |
| } |
| void RenderWidgetHostViewAndroid::AcceleratedSurfacePostSubBuffer( |