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

cc/shader.h

 // Copyright 2011 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_SHADER_H_
 #define CC_SHADER_H_
 
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include <string>
 
@@ skipping 305 matching lines @@
     int m_yuvMatrixLocation;
     int m_yuvAdjLocation;
 };
 
 class FragmentShaderColor {
 public:
     FragmentShaderColor();
     std::string getShaderString() const;
 
     void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
+    int edgeLocation() const { return -1; }
     int colorLocation() const { return m_colorLocation; }
 
 private:
     int m_colorLocation;
 };
 
+class FragmentShaderColorAA {
+public:
+    FragmentShaderColorAA();
+    std::string getShaderString() const;
+
+    void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
+    int edgeLocation() const { return m_edgeLocation; }
+    int colorLocation() const { return m_colorLocation; }
+
+private:
+    int m_edgeLocation;
+    int m_colorLocation;
+};
+
 class FragmentShaderCheckerboard {
 public:
     FragmentShaderCheckerboard();
     std::string getShaderString() const;
 
     void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
     int alphaLocation() const { return m_alphaLocation; }
     int texTransformLocation() const { return m_texTransformLocation; }
     int frequencyLocation() const { return m_frequencyLocation; }
     int colorLocation() const { return m_colorLocation; }
 private:
     int m_alphaLocation;
     int m_texTransformLocation;
     int m_frequencyLocation;
     int m_colorLocation;
 };
 
 } // namespace cc
 
 #endif  // CC_SHADER_H_