Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3027)

Unified Diff: chrome/browser/renderer_host/render_widget_host_view_views.cc

Issue 8558008: Revert 110626 - Reland 110355 - Use shared D3D9 texture to transport the compositor's backing buf... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/renderer_host/render_widget_host_view_views.cc
===================================================================
--- chrome/browser/renderer_host/render_widget_host_view_views.cc (revision 110637)
+++ chrome/browser/renderer_host/render_widget_host_view_views.cc (working copy)
@@ -1144,20 +1144,19 @@
}
void RenderWidgetHostViewViews::AcceleratedSurfaceBuffersSwapped(
- const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
+ uint64 surface_id,
+ int32 route_id,
int gpu_host_id) {
- SetExternalTexture(
- accelerated_surface_containers_[params.surface_id]->GetTexture());
+ SetExternalTexture(accelerated_surface_containers_[surface_id]->GetTexture());
glFlush();
if (!GetWidget() || !GetWidget()->GetCompositor()) {
// We have no compositor, so we have no way to display the surface
- // Must still send the ACK
- AcknowledgeSwapBuffers(params.route_id, gpu_host_id);
+ AcknowledgeSwapBuffers(route_id, gpu_host_id); // Must still send the ACK
} else {
// Add sending an ACK to the list of things to do OnCompositingEnded
on_compositing_ended_callbacks_.push_back(
- base::Bind(AcknowledgeSwapBuffers, params.route_id, gpu_host_id));
+ base::Bind(AcknowledgeSwapBuffers, route_id, gpu_host_id));
ui::Compositor *compositor = GetWidget()->GetCompositor();
if (!compositor->HasObserver(this))
compositor->AddObserver(this);
@@ -1174,12 +1173,4 @@
compositor->RemoveObserver(this);
}
-#else
-
-void RenderWidgetHostViewViews::AcceleratedSurfaceBuffersSwapped(
- const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
- int gpu_host_id) {
- NOTREACHED();
-}
-
#endif
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_views.h ('k') | content/browser/gpu/gpu_process_host_ui_shim.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698