Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / content / browser / renderer_host / compositing_iosurface_context_mac.h

diff --git a/src/content/browser/renderer_host/compositing_iosurface_context_mac.h b/src/content/browser/renderer_host/compositing_iosurface_context_mac.h
index 6de1e80..3169401 100644 (file)
--- a/src/content/browser/renderer_host/compositing_iosurface_context_mac.h
+++ b/src/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,13 +49,9 @@ 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_; }
 
-  bool IsVendorIntel();
-
   // content::GpuDataManagerObserver implementation.
   virtual void OnGpuSwitching() OVERRIDE;
 
@@ -70,27 +60,19 @@ class CompositingIOSurfaceContext
 
   CompositingIOSurfaceContext(
       int window_number,
-      NSOpenGLContext* nsgl_context,
       base::ScopedTypeRef<CGLContextObj> clg_context_strong,
       CGLContextObj clg_context,
-      bool is_vsync_disabled_,
       scoped_ptr<CompositingIOSurfaceShaderPrograms> shader_program_cache);
   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_;
   scoped_ptr<CompositingIOSurfaceShaderPrograms> shader_program_cache_;
   bool poisoned_;
 
-  bool initialized_is_intel_;
-  bool is_intel_;
-  GLint screen_;
-
   // The global map from window number and window ordering to
   // context data.
   typedef std::map<int, CompositingIOSurfaceContext*> WindowMap;