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

Unified Diff: content/browser/gpu/gpu_process_host_ui_shim.cc

Issue 638123003: Prepare to move BrowserCompositorViewMac to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use __OBJC__ Created 6 years, 2 months 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: content/browser/gpu/gpu_process_host_ui_shim.cc
diff --git a/content/browser/gpu/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc
index b7b63ff39a370cc3d87e1489d3dd03be3dbf7c45..8c4450628e7885b8275398a0659b4d9867022fd5 100644
--- a/content/browser/gpu/gpu_process_host_ui_shim.cc
+++ b/content/browser/gpu/gpu_process_host_ui_shim.cc
@@ -23,7 +23,7 @@
#include "content/public/browser/browser_thread.h"
#if defined(OS_MACOSX)
-#include "content/browser/compositor/browser_compositor_view_mac.h"
+#include "content/browser/compositor/browser_compositor_ca_layer_tree_mac.h"
#endif
#if defined(USE_OZONE)
@@ -257,17 +257,20 @@ void GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped(
// On Mac with delegated rendering, accelerated surfaces are not necessarily
// associated with a RenderWidgetHostViewBase.
+ AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
DCHECK(IsDelegatedRendererEnabled());
gfx::AcceleratedWidget native_widget =
content::GpuSurfaceTracker::Get()->AcquireNativeWidget(params.surface_id);
- BrowserCompositorViewMac::GotAcceleratedFrame(native_widget,
- params.surface_handle,
- params.surface_id,
- params.latency_info,
- params.size,
- params.scale_factor,
- host_id_,
- params.route_id);
+ BrowserCompositorCALayerTreeMacGotAcceleratedFrame(
+ native_widget,
+ params.surface_handle,
+ params.surface_id,
+ params.latency_info,
+ params.size,
+ params.scale_factor,
+ &ack_params.disable_throttling,
+ &ack_params.renderer_id);
+ Send(new AcceleratedSurfaceMsg_BufferPresented(params.route_id, ack_params));
#else
NOTREACHED();
#endif
« no previous file with comments | « content/browser/compositor/software_output_device_mac.mm ('k') | content/browser/renderer_host/render_widget_host_view_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698