mac: Clean up a few more uses of USE_SKIA

webkit/gpu/webgraphicscontext3d_in_process_impl.h

 // 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.
 
 #ifndef WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_
 #define WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_
 
 #include <list>
 #include <set>
 
 #include "base/compiler_specific.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
 #include "third_party/angle/include/GLSLANG/ShaderLang.h"
 #include "ui/gfx/native_widget_types.h"
 #include "webkit/gpu/webkit_gpu_export.h"
 
-#if !defined(OS_MACOSX)

[Nico, 2013/03/23 17:34:28]

This was very likely wrong and just wasn't updated since we switched to skia.

Is the in-process graphics context used for anything?

[Ken Russell (switch to Gerrit), 2013/03/25 18:09:38]

No, it's unused. I thought danakj just deleted it, and that jam removed the
command-line flags. The test harnesses are using the in-process command buffer
impl at this point.

[danakj, 2013/03/25 18:25:02]

I removed support for it from the offscreen context providers, but didn't delete
the class. Guess I should then.

-#define FLIP_FRAMEBUFFER_VERTICALLY
-#endif
 namespace gfx {
 class GLContext;
 class GLSurface;
 class GLShareGroup;
 }
 
 using WebKit::WGC3Dbyte;
 using WebKit::WGC3Dchar;
 using WebKit::WGC3Denum;
 using WebKit::WGC3Dboolean;
@@ skipping 475 matching lines @@
   bool Initialize(Attributes attributes);
 
   // ANGLE related.
   struct ShaderSourceEntry;
 
   typedef base::hash_map<WebGLId, ShaderSourceEntry*> ShaderSourceMap;
 
   bool AllocateOffscreenFrameBuffer(int width, int height);
   void ClearRenderTarget();
 
-#ifdef FLIP_FRAMEBUFFER_VERTICALLY
   void FlipVertically(unsigned char* framebuffer,
                       unsigned int width,
                       unsigned int height);
-#endif
 
   // Take into account the user's requested context creation attributes, in
   // particular stencil and antialias, and determine which could or could
   // not be honored based on the capabilities of the OpenGL implementation.
   void ValidateAttributes();
 
   // Resolve the given rectangle of the multisampled framebuffer if necessary.
   void ResolveMultisampledFramebuffer(
       WGC3Dint x, WGC3Dint y, WGC3Dsizei width, WGC3Dsizei height);
 
@@ skipping 20 matching lines @@
   WebGLId multisample_fbo_;
   WebGLId multisample_depth_stencil_buffer_;
   WebGLId multisample_color_buffer_;
 
   // For tracking which FBO is bound
   WebGLId bound_fbo_;
 
   // For tracking which texture is bound
   WebGLId bound_texture_;
 
-#ifdef FLIP_FRAMEBUFFER_VERTICALLY
   unsigned char* scanline_;
-#endif
 
   // Errors raised by synthesizeGLError().
   std::list<WGC3Denum> synthetic_errors_list_;
   std::set<WGC3Denum> synthetic_errors_set_;
 
   scoped_refptr<gfx::GLContext> gl_context_;
   scoped_refptr<gfx::GLSurface> gl_surface_;
 
   ShaderSourceMap shader_source_map_;
 
   ShHandle fragment_compiler_;
   ShHandle vertex_compiler_;
 };
 
 }  // namespace gpu
 }  // namespace webkit
 
 #endif  // WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_