commit 7a0d697ed69610efac1b964896edfc9bd869243c
author joshualitt <joshualitt@chromium.org> Tue Jul 28 10:20:08 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jul 28 10:20:08 2015 -0700
tree 3cbef75be2931fdaa642b81a55683a76064a065e
parent 0d986d877edae36ad7dc6fbdbc69a56ca9372702

Change GrDefaultGeoProcFactory to a namespace

BUG=skia:

Review URL: https://codereview.chromium.org/1257333002

src/gpu/GrDefaultGeoProcFactory.cpp

diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/GrDefaultGeoProcFactory.cpp
index 79abda5..68fcd05 100644
--- a/src/gpu/GrDefaultGeoProcFactory.cpp
+++ b/src/gpu/GrDefaultGeoProcFactory.cpp
@@ -16,8 +16,6 @@
  * matrix. It also leaves coverage untouched.  Behind the scenes, we may add per vertex color or
  * local coords.
  */
-typedef GrDefaultGeoProcFactory Flag;
-
 class DefaultGeoProc : public GrGeometryProcessor {
 public:
     static GrGeometryProcessor* Create(uint32_t gpTypeFlags,

src/gpu/GrDefaultGeoProcFactory.h

diff --git a/src/gpu/GrDefaultGeoProcFactory.h b/src/gpu/GrDefaultGeoProcFactory.h
index 2436854..bdefd4a 100644
--- a/src/gpu/GrDefaultGeoProcFactory.h
+++ b/src/gpu/GrDefaultGeoProcFactory.h
@@ -18,8 +18,7 @@
  * used in the creation of optimized draw states because adding default GPs to the drawstate can
  * interfere with batching due to updating the drawstate.
  */
-class GrDefaultGeoProcFactory {
-public:
+namespace GrDefaultGeoProcFactory {
     // Structs for adding vertex attributes
     struct PositionAttr {
         SkPoint fPosition;
@@ -125,31 +124,31 @@
         const SkMatrix* fMatrix;
     };
 
-    static const GrGeometryProcessor* Create(const Color&,
-                                             const Coverage&,
-                                             const LocalCoords&,
-                                             const SkMatrix& viewMatrix = SkMatrix::I());
+    const GrGeometryProcessor* Create(const Color&,
+                                      const Coverage&,
+                                      const LocalCoords&,
+                                      const SkMatrix& viewMatrix = SkMatrix::I());
 
     /*
      * Use this factory to create a GrGeometryProcessor that expects a device space vertex position
      * attribute. The view matrix must still be provided to compute correctly transformed
      * coordinates for GrFragmentProcessors. It may fail if the view matrix is not invertible.
      */
-    static const GrGeometryProcessor* CreateForDeviceSpace(const Color&,
-                                                           const Coverage&,
-                                                           const LocalCoords&,
-                                                           const SkMatrix& viewMatrix);
+    const GrGeometryProcessor* CreateForDeviceSpace(const Color&,
+                                                    const Coverage&,
+                                                    const LocalCoords&,
+                                                    const SkMatrix& viewMatrix);
 
     // TODO deprecate this
-    static const GrGeometryProcessor* Create(uint32_t gpTypeFlags,
-                                             GrColor,
-                                             bool localCoordsWillBeRead,
-                                             bool coverageWillBeIgnored,
-                                             const SkMatrix& viewMatrix = SkMatrix::I(),
-                                             const SkMatrix& localMatrix = SkMatrix::I(),
-                                             uint8_t coverage = 0xff);
+    const GrGeometryProcessor* Create(uint32_t gpTypeFlags,
+                                      GrColor,
+                                      bool localCoordsWillBeRead,
+                                      bool coverageWillBeIgnored,
+                                      const SkMatrix& viewMatrix = SkMatrix::I(),
+                                      const SkMatrix& localMatrix = SkMatrix::I(),
+                                      uint8_t coverage = 0xff);
 
-    static size_t DefaultVertexStride() { return sizeof(PositionAttr); }
+    inline size_t DefaultVertexStride() { return sizeof(PositionAttr); }
 };
 
 #endif

src/gpu/GrRectBatch.cpp

diff --git a/src/gpu/GrRectBatch.cpp b/src/gpu/GrRectBatch.cpp
index 5ef5591..efb45de 100644
--- a/src/gpu/GrRectBatch.cpp
+++ b/src/gpu/GrRectBatch.cpp
@@ -175,9 +175,7 @@
         The vertex attrib order is always pos, color, [local coords].
      */
     const GrGeometryProcessor* createRectGP() {
-        typedef GrDefaultGeoProcFactory::Color Color;
-        typedef GrDefaultGeoProcFactory::Coverage Coverage;
-        typedef GrDefaultGeoProcFactory::LocalCoords LocalCoords;
+        using namespace GrDefaultGeoProcFactory;
         Color color(Color::kAttribute_Type);
         Coverage coverage(this->coverageIgnored() ? Coverage::kNone_Type : Coverage::kSolid_Type);