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

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

Issue 311263003: Delete non-CoreAnimation code in RWHVMac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@swappressure
Patch Set: Update driver bug Created 6 years, 6 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/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 2904178ca396b307184cbf65cbe4e34b12801546..52a9898929375d32a9e66a2c71b66afc5df1c739 100644
--- a/content/browser/renderer_host/compositing_iosurface_context_mac.h
+++ b/content/browser/renderer_host/compositing_iosurface_context_mac.h
@@ -19,12 +19,6 @@
namespace content {
-enum CoreAnimationStatus {
- CORE_ANIMATION_DISABLED,
- CORE_ANIMATION_ENABLED,
-};
-CoreAnimationStatus GetCoreAnimationStatus();
-
class CompositingIOSurfaceShaderPrograms;
class CompositingIOSurfaceContext
@@ -55,7 +49,6 @@ class CompositingIOSurfaceContext
CompositingIOSurfaceShaderPrograms* shader_program_cache() const {
return shader_program_cache_.get();
}
- NSOpenGLContext* nsgl_context() const;
CGLContextObj cgl_context() const { return cgl_context_; }
bool is_vsync_disabled() const { return is_vsync_disabled_; }
int window_number() const { return window_number_; }
@@ -68,7 +61,6 @@ class CompositingIOSurfaceContext
CompositingIOSurfaceContext(
int window_number,
- NSOpenGLContext* nsgl_context,
base::ScopedTypeRef<CGLContextObj> clg_context_strong,
CGLContextObj clg_context,
bool is_vsync_disabled_,
@@ -76,9 +68,8 @@ class CompositingIOSurfaceContext
virtual ~CompositingIOSurfaceContext();
int window_number_;
- base::scoped_nsobject<NSOpenGLContext> nsgl_context_;
base::ScopedTypeRef<CGLContextObj> cgl_context_strong_;
- // Weak, backed by |nsgl_context_| or |cgl_context_strong_|.
+ // Weak, backed by |cgl_context_strong_|.
CGLContextObj cgl_context_;
bool is_vsync_disabled_;

Powered by Google App Engine
This is Rietveld 408576698