Delete non-CoreAnimation code in RWHVMac

content/browser/renderer_host/compositing_iosurface_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/compositing_iosurface_mac.h"
 
 #include <OpenGL/CGLIOSurface.h>
 #include <OpenGL/CGLRenderers.h>
 #include <OpenGL/OpenGL.h>
 
@@ skipping 265 matching lines @@
   if (CGLGetParameter(offscreen_context_->cgl_context(),
                       kCGLCPCurrentRendererID,
                       &current_renderer_id) == kCGLNoError)
     return current_renderer_id & kCGLRendererIDMatchingMask;
   return -1;
 }
 
 bool CompositingIOSurfaceMac::DrawIOSurface(
     scoped_refptr<CompositingIOSurfaceContext> drawing_context,
     const gfx::Rect& window_rect,
-    float window_scale_factor,
-    bool flush_drawable) {
+    float window_scale_factor) {
   DCHECK_EQ(CGLGetCurrentContext(), drawing_context->cgl_context());
 
   bool has_io_surface = HasIOSurface();
   TRACE_EVENT1("browser", "CompositingIOSurfaceMac::DrawIOSurface",
                "has_io_surface", has_io_surface);
 
   gfx::Rect pixel_window_rect =
       ToNearestRect(gfx::ScaleRect(window_rect, window_scale_factor));
   glViewport(
       pixel_window_rect.x(), pixel_window_rect.y(),
@@ skipping 53 matching lines @@
     glUseProgram(0); CHECK_AND_SAVE_GL_ERROR();
   } else {
     // Should match the clear color of RenderWidgetHostViewMac.
     glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT);
   }
 
   bool workaround_needed =
       GpuDataManagerImpl::GetInstance()->IsDriverBugWorkaroundActive(
           gpu::FORCE_GL_FINISH_AFTER_COMPOSITING);
-  // Note that this is not necessary when not flushing the drawable in Mavericks
-  // or later if we are in one of the two following situations:
-  // - we are drawing an underlay, and we will call glFinish() when drawing
-  //   the overlay.
-  // - we are using CoreAnimation, where this bug does not manifest.
-  if (workaround_needed && !flush_drawable && base::mac::IsOSMavericksOrLater())
-    workaround_needed = false;
-
   if (workaround_needed) {
     TRACE_EVENT0("gpu", "glFinish");
     glFinish();
   }
 
-  bool result = true;
-  if (flush_drawable) {
-    TRACE_EVENT0("gpu", "flushBuffer");
-    [drawing_context->nsgl_context() flushBuffer];
-  }
-
   // Check if any of the drawing calls result in an error.
   GetAndSaveGLError();
+  bool result = true;
   if (gl_error_ != GL_NO_ERROR) {
     LOG(ERROR) << "GL error in DrawIOSurface: " << gl_error_;
     result = false;
     // If there was an error, clear the screen to a light grey to avoid
     // rendering artifacts. If we're in a really bad way, this too may
     // generate an error. Clear the GL error afterwards just in case.
     glClearColor(0.8, 0.8, 0.8, 1.0);
     glClear(GL_COLOR_BUFFER_BIT);
     glGetError();
   }
@@ skipping 536 matching lines @@
 void CompositingIOSurfaceMac::EvictionMarkEvicted() {
   if (eviction_queue_iterator_ == eviction_queue_.Get().end())
     return;
   eviction_queue_.Get().erase(eviction_queue_iterator_);
   eviction_queue_iterator_ = eviction_queue_.Get().end();
   eviction_has_been_drawn_since_updated_ = false;
 }
 
 // static
 void CompositingIOSurfaceMac::EvictionScheduleDoEvict() {
-  if (GetCoreAnimationStatus() == CORE_ANIMATION_DISABLED)
-    return;
   if (eviction_scheduled_)
     return;
   if (eviction_queue_.Get().size() <= kMaximumUnevictedSurfaces)
     return;
 
   eviction_scheduled_ = true;
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&CompositingIOSurfaceMac::EvictionDoEvict));
 }
@@ skipping 27 matching lines @@
 }
 
 // static
 base::LazyInstance<CompositingIOSurfaceMac::EvictionQueue>
     CompositingIOSurfaceMac::eviction_queue_;
 
 // static
 bool CompositingIOSurfaceMac::eviction_scheduled_ = false;
 
 }  // namespace content