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

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

Issue 647053002: Make remote CoreAnimation GPU-switching aware (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | content/common/gpu/image_transport_surface_fbo_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/image_transport_surface_calayer_mac.mm
diff --git a/content/common/gpu/image_transport_surface_calayer_mac.mm b/content/common/gpu/image_transport_surface_calayer_mac.mm
index 37354607502d3de3dd67f1832110acf6ec7212e7..f329e004ea52127ffe3cdd97d1831e41279311f6 100644
--- a/content/common/gpu/image_transport_surface_calayer_mac.mm
+++ b/content/common/gpu/image_transport_surface_calayer_mac.mm
@@ -4,6 +4,8 @@
#include "content/common/gpu/image_transport_surface_calayer_mac.h"
+#include <OpenGL/CGLRenderers.h>
+
#include "base/command_line.h"
#include "base/mac/sdk_forward_declarations.h"
#include "content/common/gpu/surface_handle_types_mac.h"
@@ -291,6 +293,14 @@ void CALayerStorageProvider::LayerDoDraw() {
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
glDisable(GL_TEXTURE_RECTANGLE_ARB);
+ GLint current_renderer_id = 0;
+ if (CGLGetParameter(CGLGetCurrentContext(),
+ kCGLCPCurrentRendererID,
+ &current_renderer_id) == kCGLNoError) {
+ current_renderer_id &= kCGLRendererIDMatchingMask;
+ transport_surface_->SetRendererID(current_renderer_id);
+ }
+
// Allow forward progress in the context now that the swap is complete.
UnblockBrowserIfNeeded();
}
« no previous file with comments | « no previous file | content/common/gpu/image_transport_surface_fbo_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698