Re-land: cc: Added antialiasing support for solid color layers

cc/gl_renderer.h

 // Copyright 2010 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 CC_GL_RENDERER_H_
 #define CC_GL_RENDERER_H_
 
 #include "cc/cc_export.h"
 #include "cc/checkerboard_draw_quad.h"
 #include "cc/debug_border_draw_quad.h"
@@ skipping 134 matching lines @@
                         const gfx::RectF& quad_rect,
                         int matrix_location);
   void SetBlendEnabled(bool enabled);
   void SetUseProgram(unsigned program);
 
   void CopyTextureToFramebuffer(const DrawingFrame& frame,
                                 int texture_id,
                                 gfx::Rect rect,
                                 const gfx::Transform& draw_matrix);
 
+  // Check if quad needs antialiasing and if so, inflate the quad and
+  // fill edge array for fragment shader.  localQuad is set to
+  // inflated quad if antialiasing is required, otherwise it is left
+  // unchanged.  edge array is filled with inflated quad's edge data
+  // if antialiasing is required, otherwise it is left unchanged.
+  // Returns true if quad requires antialiasing and false otherwise.
+  bool SetupQuadForAntialiasing(const gfx::Transform& deviceTransform,
+                                const DrawQuad* quad, gfx::QuadF* localQuad,

[danakj, 2013/03/14 00:54:25]

1 param per line if they don't all fit on a single line.

[ernstm, 2013/03/14 17:08:33]

Done.

+                                float edge[24]) const;
+
   bool UseScopedTexture(DrawingFrame& frame,
                         const ScopedResource* resource,
                         gfx::Rect viewport_rect);
 
   bool MakeContextCurrent();
 
   bool InitializeSharedObjects();
   void CleanupSharedObjects();
 
   // WebKit::
@@ skipping 60 matching lines @@
       TextureIOSurfaceProgram;
 
   // Video shaders.
   typedef ProgramBinding<VertexShaderVideoTransform,
                          FragmentShaderOESImageExternal>
       VideoStreamTextureProgram;
   typedef ProgramBinding<VertexShaderPosTexYUVStretch, FragmentShaderYUVVideo>
       VideoYUVProgram;
 
   // Special purpose / effects shaders.
-  typedef ProgramBinding<VertexShaderPos, FragmentShaderColor>
+  typedef ProgramBinding<VertexShaderQuad, FragmentShaderColor>
       SolidColorProgram;
+  typedef ProgramBinding<VertexShaderQuad, FragmentShaderColorAA>
+      SolidColorProgramAA;
 
   const TileProgram* GetTileProgram();
   const TileProgramOpaque* GetTileProgramOpaque();
   const TileProgramAA* GetTileProgramAA();
   const TileProgramSwizzle* GetTileProgramSwizzle();
   const TileProgramSwizzleOpaque* GetTileProgramSwizzleOpaque();
   const TileProgramSwizzleAA* GetTileProgramSwizzleAA();
   const TileCheckerboardProgram* GetTileCheckerboardProgram();
 
   const RenderPassProgram* GetRenderPassProgram();
   const RenderPassProgramAA* GetRenderPassProgramAA();
   const RenderPassMaskProgram* GetRenderPassMaskProgram();
   const RenderPassMaskProgramAA* GetRenderPassMaskProgramAA();
 
   const TextureProgram* GetTextureProgram();
   const TextureProgramFlip* GetTextureProgramFlip();
   const TextureIOSurfaceProgram* GetTextureIOSurfaceProgram();
 
   const VideoYUVProgram* GetVideoYUVProgram();
   const VideoStreamTextureProgram* GetVideoStreamTextureProgram();
 
   const SolidColorProgram* GetSolidColorProgram();
+  const SolidColorProgramAA* GetSolidColorProgramAA();
 
   scoped_ptr<TileProgram> tile_program_;
   scoped_ptr<TileProgramOpaque> tile_program_opaque_;
   scoped_ptr<TileProgramAA> tile_program_aa_;
   scoped_ptr<TileProgramSwizzle> tile_program_swizzle_;
   scoped_ptr<TileProgramSwizzleOpaque> tile_program_swizzle_opaque_;
   scoped_ptr<TileProgramSwizzleAA> tile_program_swizzle_aa_;
   scoped_ptr<TileCheckerboardProgram> tile_checkerboard_program_;
 
   scoped_ptr<RenderPassProgram> render_pass_program_;
   scoped_ptr<RenderPassProgramAA> render_pass_program_aa_;
   scoped_ptr<RenderPassMaskProgram> render_pass_mask_program_;
   scoped_ptr<RenderPassMaskProgramAA> render_pass_mask_program_aa_;
 
   scoped_ptr<TextureProgram> texture_program_;
   scoped_ptr<TextureProgramFlip> texture_program_flip_;
   scoped_ptr<TextureIOSurfaceProgram> texture_io_surface_program_;
 
   scoped_ptr<VideoYUVProgram> video_yuv_program_;
   scoped_ptr<VideoStreamTextureProgram> video_stream_texture_program_;
 
   scoped_ptr<SolidColorProgram> solid_color_program_;
+  scoped_ptr<SolidColorProgramAA> solid_color_program_aa_;
 
   OutputSurface* output_surface_;
   WebKit::WebGraphicsContext3D* context_;
 
   gfx::Rect swap_buffer_rect_;
   gfx::Rect scissor_rect_;
   bool is_viewport_changed_;
   bool is_backbuffer_discarded_;
   bool discard_backbuffer_when_not_visible_;
   bool is_using_bind_uniform_;
@@ skipping 18 matching lines @@
 #if DEBUG_GL_CALLS && !defined(NDEBUG)
 #define GLC(context, x)                                                        \
   (x, GLRenderer::DebugGLCall (&* context, #x, __FILE__, __LINE__))
 #else
 #define GLC(context, x) (x)
 #endif
 
 }
 
 #endif  // CC_GL_RENDERER_H_