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

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

Issue 1161853006: Mac: Add partial swap support to NSOpenGLContext path (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Incorporate review feedback Created 5 years, 6 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
« no previous file with comments | « content/browser/gpu/gpu_process_host_ui_shim.h ('k') | content/common/gpu/gpu_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1df45fc83965bf1e32eed7c3e3797ec5967738fd..6c7aa9c11b710656da2a03ff3d3eaa7bed25b0e5 100644
--- a/content/browser/gpu/gpu_process_host_ui_shim.cc
+++ b/content/browser/gpu/gpu_process_host_ui_shim.cc
@@ -225,8 +225,10 @@ bool GpuProcessHostUIShim::OnControlMessageReceived(
OnLogMessage)
IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceInitialized,
OnAcceleratedSurfaceInitialized)
+#if defined(OS_MACOSX)
IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceBuffersSwapped,
OnAcceleratedSurfaceBuffersSwapped)
+#endif
IPC_MESSAGE_HANDLER(GpuHostMsg_GraphicsInfoCollected,
OnGraphicsInfoCollected)
IPC_MESSAGE_HANDLER(GpuHostMsg_VideoMemoryUsageStats,
@@ -268,9 +270,9 @@ void GpuProcessHostUIShim::OnAcceleratedSurfaceInitialized(int32 surface_id,
view->AcceleratedSurfaceInitialized(route_id);
}
+#if defined(OS_MACOSX)
void GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped(
const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params) {
-#if defined(OS_MACOSX)
TRACE_EVENT0("renderer",
"GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped");
if (!ui::LatencyInfo::Verify(params.latency_info,
@@ -298,14 +300,13 @@ void GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped(
ui::AcceleratedWidgetMacGotAcceleratedFrame(
native_widget, params.surface_handle, params.latency_info, params.size,
params.scale_factor,
+ params.damage_rect,
base::Bind(&OnSurfaceDisplayedCallback, params.surface_id),
&ack_params.disable_throttling, &ack_params.renderer_id);
}
Send(new AcceleratedSurfaceMsg_BufferPresented(params.route_id, ack_params));
-#else
- NOTREACHED();
-#endif
}
+#endif
void GpuProcessHostUIShim::OnVideoMemoryUsageStatsReceived(
const GPUVideoMemoryUsageStats& video_memory_usage_stats) {
« no previous file with comments | « content/browser/gpu/gpu_process_host_ui_shim.h ('k') | content/common/gpu/gpu_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698