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

Unified Diff: content/common/gpu/image_transport_surface_overlay_mac.mm

Issue 1532813002: Replace IOSurfaceManager by directly passing IOSurface Mach ports over Chrome IPC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Windows compile Created 5 years 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/common/gpu/image_transport_surface_overlay_mac.mm
diff --git a/content/common/gpu/image_transport_surface_overlay_mac.mm b/content/common/gpu/image_transport_surface_overlay_mac.mm
index 40d0df5305719dabbfadf0c7996fe675edc7512d..0dcb5d135414775eb5c6d3d83521301ff744918d 100644
--- a/content/common/gpu/image_transport_surface_overlay_mac.mm
+++ b/content/common/gpu/image_transport_surface_overlay_mac.mm
@@ -22,7 +22,6 @@ typedef void* GLeglImageOES;
#include "base/mac/scoped_cftyperef.h"
#include "content/common/gpu/gpu_messages.h"
#include "ui/accelerated_widget_mac/io_surface_context.h"
-#include "ui/accelerated_widget_mac/surface_handle_types.h"
#include "ui/base/cocoa/animation_utils.h"
#include "ui/base/cocoa/remote_layer_api.h"
#include "ui/base/ui_base_switches.h"
@@ -457,11 +456,10 @@ void ImageTransportSurfaceOverlayMac::DisplayFirstPendingSwapImmediately() {
// Send acknowledgement to the browser.
GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
if (use_remote_layer_api_) {
- params.surface_handle =
- ui::SurfaceHandleFromCAContextID([ca_context_ contextId]);
+ params.ca_context_id = [ca_context_ contextId];
} else {
- params.surface_handle =
- ui::SurfaceHandleFromIOSurfaceID(current_root_plane_->io_surface_id);
+ params.io_surface.reset(
+ IOSurfaceCreateMachPort(current_root_plane_->io_surface));
}
params.size = swap->pixel_size;
params.scale_factor = swap->scale_factor;

Powered by Google App Engine
This is Rietveld 408576698