Separate GL path rendering state from GrGpuGL to GrGLPathRendering

src/gpu/gl/GrGLPath.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrGLPath.h"
 #include "GrGLPathRendering.h"
@@ skipping 67 matching lines @@
 }
 
 }
 
 static const bool kIsWrapped = false; // The constructor creates the GL path object.
 
 void GrGLPath::InitPathObject(GrGpuGL* gpu,
                               GrGLuint pathID,
                               const SkPath& skPath,
                               const SkStrokeRec& stroke) {
-    GrGLPathRendering* pr = gpu->pathRendering();
+    GrGLPathRendering* pr = gpu->glPathRendering();
     SkSTArray<16, GrGLubyte, true> pathCommands;
     SkSTArray<16, SkPoint, true> pathPoints;
 
     int verbCnt = skPath.countVerbs();
     int pointCnt = skPath.countPoints();
     pathCommands.resize_back(verbCnt);
     pathPoints.resize_back(pointCnt);
 
     // TODO: Direct access to path points since we could pass them on directly.
     skPath.getPoints(&pathPoints[0], pointCnt);
@@ skipping 15 matching lines @@
         GrGLenum join = join_to_gl_join(stroke.getJoin());
         pr->pathParameteri(pathID, GR_GL_PATH_JOIN_STYLE, join);
         GrGLenum cap = cap_to_gl_cap(stroke.getCap());
         pr->pathParameteri(pathID, GR_GL_PATH_INITIAL_END_CAP, cap);
         pr->pathParameteri(pathID, GR_GL_PATH_TERMINAL_END_CAP, cap);
     }
 }
 
 GrGLPath::GrGLPath(GrGpuGL* gpu, const SkPath& path, const SkStrokeRec& stroke)
     : INHERITED(gpu, kIsWrapped, path, stroke),
-      fPathID(gpu->pathRendering()->genPaths(1)) {
+      fPathID(gpu->glPathRendering()->genPaths(1)) {
     SkASSERT(!path.isEmpty());
 
     InitPathObject(gpu, fPathID, fSkPath, stroke);
 
     if (stroke.needToApply()) {
         // FIXME: try to account for stroking, without rasterizing the stroke.
         fBounds.outset(stroke.getWidth(), stroke.getWidth());
     }
 }
 
 GrGLPath::~GrGLPath() {
     this->release();
 }
 
 void GrGLPath::onRelease() {
     if (0 != fPathID && !this->isWrapped()) {
-        static_cast<GrGpuGL*>(this->getGpu())->pathRendering()->deletePaths(fPathID, 1);
+        static_cast<GrGpuGL*>(this->getGpu())->glPathRendering()->deletePaths(fPathID, 1);
         fPathID = 0;
     }
 
     INHERITED::onRelease();
 }
 
 void GrGLPath::onAbandon() {
     fPathID = 0;
 
     INHERITED::onAbandon();
 }