Index: gpu/ipc/service/image_transport_surface_overlay_mac.mm |
diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.mm b/gpu/ipc/service/image_transport_surface_overlay_mac.mm |
index 1ced5d09fe883c99e9e6531bd40af9c9056e4e24..8c45533a7ea15d5e495ce24f3bec754ac2f9edcd 100644 |
--- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm |
+++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm |
@@ -22,7 +22,6 @@ typedef void* GLeglImageOES; |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
-#include "base/mac/scoped_cftyperef.h" |
#include "base/trace_event/trace_event.h" |
#include "gpu/ipc/common/gpu_messages.h" |
#include "gpu/ipc/service/gpu_channel_manager.h" |
@@ -299,31 +298,9 @@ bool ImageTransportSurfaceOverlayMac::ScheduleOverlayPlane( |
} |
bool ImageTransportSurfaceOverlayMac::ScheduleCALayer( |
- gl::GLImage* contents_image, |
- const gfx::RectF& contents_rect, |
- float opacity, |
- unsigned background_color, |
- unsigned edge_aa_mask, |
- const gfx::RectF& rect, |
- bool is_clipped, |
- const gfx::RectF& clip_rect, |
- const gfx::Transform& transform, |
- int sorting_context_id, |
- unsigned filter) { |
- base::ScopedCFTypeRef<IOSurfaceRef> io_surface; |
- base::ScopedCFTypeRef<CVPixelBufferRef> cv_pixel_buffer; |
- if (contents_image) { |
- gl::GLImageIOSurface* io_surface_image = |
- static_cast<gl::GLImageIOSurface*>(contents_image); |
- io_surface = io_surface_image->io_surface(); |
- cv_pixel_buffer = io_surface_image->cv_pixel_buffer(); |
- } |
+ const ui::CARendererLayerParams& params) { |
return ca_layer_tree_coordinator_->GetPendingCARendererLayerTree() |
- ->ScheduleCALayer(is_clipped, gfx::ToEnclosingRect(clip_rect), |
- sorting_context_id, transform, io_surface, |
- cv_pixel_buffer, contents_rect, |
- gfx::ToEnclosingRect(rect), background_color, |
- edge_aa_mask, opacity, filter); |
+ ->ScheduleCALayer(params); |
} |
bool ImageTransportSurfaceOverlayMac::IsSurfaceless() const { |