mac: Clean up a few more uses of USE_SKIA

webkit/gpu/webgraphicscontext3d_in_process_impl.cc

 // 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 "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 50 matching lines @@
       texture_(0),
       fbo_(0),
       depth_stencil_buffer_(0),
       cached_width_(0),
       cached_height_(0),
       multisample_fbo_(0),
       multisample_depth_stencil_buffer_(0),
       multisample_color_buffer_(0),
       bound_fbo_(0),
       bound_texture_(0),
-#ifdef FLIP_FRAMEBUFFER_VERTICALLY
       scanline_(0),
-#endif
       gl_context_(context),
       gl_surface_(surface),
       fragment_compiler_(0),
       vertex_compiler_(0) {
 }
 
 // All instances in a process that share resources are in the same share group.
 static base::LazyInstance<
     std::set<WebGraphicsContext3DInProcessImpl*> >
         g_all_shared_contexts = LAZY_INSTANCE_INITIALIZER;
@@ skipping 12 matching lines @@
   if (attributes_.antialias) {
     glDeleteRenderbuffersEXT(1, &multisample_color_buffer_);
     if (attributes_.depth || attributes_.stencil)
       glDeleteRenderbuffersEXT(1, &multisample_depth_stencil_buffer_);
     glDeleteFramebuffersEXT(1, &multisample_fbo_);
   } else {
     if (attributes_.depth || attributes_.stencil)
       glDeleteRenderbuffersEXT(1, &depth_stencil_buffer_);
   }
   glDeleteTextures(1, &texture_);
-#ifdef FLIP_FRAMEBUFFER_VERTICALLY
   if (scanline_)
     delete[] scanline_;
-#endif
   glDeleteFramebuffersEXT(1, &fbo_);
 
   gl_context_->ReleaseCurrent(gl_surface_.get());
   gl_context_->Destroy();
   gl_surface_->Destroy();
 
   for (ShaderSourceMap::iterator ii = shader_source_map_.begin();
        ii != shader_source_map_.end(); ++ii) {
     if (ii->second)
       delete ii->second;
@@ skipping 263 matching lines @@
   bool must_restore_fbo = false;
   if (gl_surface_->IsOffscreen())
     must_restore_fbo = AllocateOffscreenFrameBuffer(width, height);
 
   gl_surface_->Resize(gfx::Size(width, height));
   ClearRenderTarget();
 
   if (must_restore_fbo)
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, bound_fbo_);
 
-#ifdef FLIP_FRAMEBUFFER_VERTICALLY
   if (scanline_) {
     delete[] scanline_;
     scanline_ = 0;
   }
   scanline_ = new unsigned char[width * 4];
-#endif  // FLIP_FRAMEBUFFER_VERTICALLY
 }
 
 bool WebGraphicsContext3DInProcessImpl::AllocateOffscreenFrameBuffer(
     int width, int height) {
   GLenum target = GL_TEXTURE_2D;
 
   if (!texture_) {
     // Generate the texture object
     texture_ = CreateTextureObject(target);
     // Generate the framebuffer object
@@ skipping 206 matching lines @@
   if (isScissorEnabled)
     glEnable(GL_SCISSOR_TEST);
   else
     glDisable(GL_SCISSOR_TEST);
   if (isDitherEnabled)
     glEnable(GL_DITHER);
   else
     glDisable(GL_DITHER);
 }
 
-#ifdef FLIP_FRAMEBUFFER_VERTICALLY
 void WebGraphicsContext3DInProcessImpl::FlipVertically(
     unsigned char* framebuffer, unsigned int width, unsigned int height) {
   unsigned char* scanline = scanline_;
   if (!scanline)
     return;
   unsigned int row_bytes = width * 4;
   unsigned int count = height / 2;
   for (unsigned int i = 0; i < count; i++) {
     unsigned char* row_a = framebuffer + i * row_bytes;
     unsigned char* row_b = framebuffer + (height - i - 1) * row_bytes;
     // FIXME: this is where the multiplication of the alpha
     // channel into the color buffer will need to occur if the
     // user specifies the "premultiplyAlpha" flag in the context
     // creation attributes.
     memcpy(scanline, row_b, row_bytes);
     memcpy(row_b, row_a, row_bytes);
     memcpy(row_a, scanline, row_bytes);
   }
 }
-#endif
 
 bool WebGraphicsContext3DInProcessImpl::readBackFramebuffer(
     unsigned char* pixels, size_t bufferSize, WebGLId framebuffer,
     int width, int height) {
   if (bufferSize != static_cast<size_t>(4 * width * height))
     return false;
 
   makeContextCurrent();
 
   // Earlier versions of this code used the GPU to flip the
@@ skipping 32 matching lines @@
   } else {
     glReadPixels(0, 0, width, height,
                  GL_BGRA, GL_UNSIGNED_BYTE, pixels);
   }
 
   if (must_restore_pack_alignment)
     glPixelStorei(GL_PACK_ALIGNMENT, pack_alignment);
 
   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, bound_fbo_);
 
-#ifdef FLIP_FRAMEBUFFER_VERTICALLY
   if (pixels)
     FlipVertically(pixels, width, height);
-#endif
 
   return true;
 }
 
 bool WebGraphicsContext3DInProcessImpl::readBackFramebuffer(
     unsigned char* pixels, size_t bufferSize) {
   return readBackFramebuffer(pixels, bufferSize, fbo_, width(), height());
 }
 
 void WebGraphicsContext3DInProcessImpl::synthesizeGLError(WGC3Denum error) {
@@ skipping 1111 matching lines @@
   if (length > 1) {
     entry->translated_source.reset(new char[length]);
     ShGetObjectCode(compiler, entry->translated_source.get());
   }
   entry->is_valid = true;
   return true;
 }
 
 }  // namespace gpu
 }  // namespace webkit