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

Unified Diff: content/browser/compositor/io_surface_layer_mac.h

Issue 558803002: Workaround to prevent crashes when destroying CGL contexts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use RETAIN Created 6 years, 3 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/compositor/io_surface_layer_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/compositor/io_surface_layer_mac.h
diff --git a/content/browser/compositor/io_surface_layer_mac.h b/content/browser/compositor/io_surface_layer_mac.h
index 11cc0ac57857898c533c806554835e3a22f005af..7ed5d0927d68c85ae179dabf8875e8def8fcccdd 100644
--- a/content/browser/compositor/io_surface_layer_mac.h
+++ b/content/browser/compositor/io_surface_layer_mac.h
@@ -12,6 +12,7 @@
#include "base/memory/ref_counted.h"
#include "base/timer/timer.h"
#include "ui/gfx/size.h"
+#include "ui/gl/scoped_cgl.h"
@class IOSurfaceLayer;
@@ -66,10 +67,12 @@ class IOSurfaceLayerClient {
// size of |io_surface_|.
gfx::Size frame_pixel_size_;
- // The GL texture that is bound to |io_surface_|. If |io_surface_| changes,
- // then this is marked as dirty by setting |io_surface_texture_dirty_|.
+ // The GL texture that was bound to |io_surface_| during the last draw call,
+ // along with the context that was done in, and the value of |io_surface_| at
+ // the time of the bind.
GLuint io_surface_texture_;
- bool io_surface_texture_dirty_;
+ base::ScopedTypeRef<CGLContextObj> io_surface_texture_context_;
+ base::ScopedCFTypeRef<IOSurfaceRef> io_surface_texture_io_surface_;
// The CGL renderer ID, captured at draw time.
GLint cgl_renderer_id_;
« no previous file with comments | « no previous file | content/browser/compositor/io_surface_layer_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698