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

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

Issue 1251783002: Mac Overlays: Wire up overlays on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@part22
Patch Set: Add more dchecks Created 5 years, 5 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/common/gpu/image_transport_surface_fbo_mac.mm
diff --git a/content/common/gpu/image_transport_surface_fbo_mac.mm b/content/common/gpu/image_transport_surface_fbo_mac.mm
index e6fcc408f357557d0661a6e4d94c302e57fb5220..33f6428d35afe2f91614896f5c9603db2f0e5be1 100644
--- a/content/common/gpu/image_transport_surface_fbo_mac.mm
+++ b/content/common/gpu/image_transport_surface_fbo_mac.mm
@@ -8,6 +8,7 @@
#include "content/common/gpu/gpu_messages.h"
#include "content/common/gpu/image_transport_surface_calayer_mac.h"
#include "content/common/gpu/image_transport_surface_iosurface_mac.h"
+#include "content/common/gpu/image_transport_surface_overlay_mac.h"
#include "ui/base/cocoa/remote_layer_api.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gl/gl_context.h"
@@ -20,7 +21,10 @@ scoped_refptr<gfx::GLSurface> ImageTransportSurfaceCreateNativeSurface(
GpuChannelManager* manager,
GpuCommandBufferStub* stub,
gfx::PluginWindowHandle handle) {
- return new ImageTransportSurfaceFBO(manager, stub, handle);
+ if (ui::RemoteLayerAPISupported())
+ return new ImageTransportSurfaceOverlayMac(manager, stub, handle);
+ else
+ return new ImageTransportSurfaceFBO(manager, stub, handle);
}
ImageTransportSurfaceFBO::ImageTransportSurfaceFBO(

Powered by Google App Engine
This is Rietveld 408576698