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

Unified Diff: content/browser/renderer_host/compositing_iosurface_context_mac.h

Issue 147493011: Use base::ScopedTypeRef for CGL types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase again Created 6 years, 10 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/browser/renderer_host/compositing_iosurface_context_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/compositing_iosurface_context_mac.h
diff --git a/content/browser/renderer_host/compositing_iosurface_context_mac.h b/content/browser/renderer_host/compositing_iosurface_context_mac.h
index 4abb00893e66fd6e36bfb61c0212dba29b2cd9fa..357925b719b1601d566d0cd98a437b1b7d1b9c0f 100644
--- a/content/browser/renderer_host/compositing_iosurface_context_mac.h
+++ b/content/browser/renderer_host/compositing_iosurface_context_mac.h
@@ -15,6 +15,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "content/browser/renderer_host/display_link_mac.h"
+#include "ui/gl/scoped_cgl.h"
namespace content {
@@ -60,7 +61,7 @@ class CompositingIOSurfaceContext
CompositingIOSurfaceContext(
int window_number,
NSOpenGLContext* nsgl_context,
- CGLContextObj clg_context_strong,
+ base::ScopedTypeRef<CGLContextObj> clg_context_strong,
CGLContextObj clg_context,
bool is_vsync_disabled_,
scoped_refptr<DisplayLinkMac> display_link,
@@ -69,7 +70,7 @@ class CompositingIOSurfaceContext
int window_number_;
base::scoped_nsobject<NSOpenGLContext> nsgl_context_;
- CGLContextObj cgl_context_strong_;
+ base::ScopedTypeRef<CGLContextObj> cgl_context_strong_;
// Weak, backed by |nsgl_context_| or |cgl_context_strong_|.
CGLContextObj cgl_context_;
« no previous file with comments | « no previous file | content/browser/renderer_host/compositing_iosurface_context_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698