commit 7bceedc550513b13e0065aca66e55204a2ba3e1f
author robertphillips <robertphillips@google.com> Tue Dec 01 12:51:26 2015 -0800
committer Commit bot <commit-bot@chromium.org> Tue Dec 01 12:51:26 2015 -0800
tree d31937e06efaf725e6e05ec45c7f9e5022337590
parent c1da4d0e9249c1977d76ad66b06c87487c21b4bb

Retract GrRenderTarget a bit

These sites don't necessarily need the full power of a GrRenderTarget object. This is a clean up for switching over to GrRenderTargetProxys.

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

src/gpu/GrTextContext.cpp

diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp
index 0ef18aa..5cfcf64 100644
--- a/src/gpu/GrTextContext.cpp
+++ b/src/gpu/GrTextContext.cpp
@@ -51,7 +51,7 @@
     } while (textContext);
 
     // fall back to drawing as a path
-    this->drawTextAsPath(dc, rt, clip, skPaint, viewMatrix,
+    this->drawTextAsPath(dc, clip, skPaint, viewMatrix,
                          text, byteLength, x, y, clipBounds);
 }
 
@@ -77,7 +77,7 @@
     } while (textContext);
 
     // fall back to drawing as a path
-    this->drawPosTextAsPath(dc, rt, clip, skPaint, viewMatrix, text, byteLength, pos,
+    this->drawPosTextAsPath(dc, clip, skPaint, viewMatrix, text, byteLength, pos,
                             scalarsPerPosition, offset, clipBounds);
 }
 
@@ -161,7 +161,7 @@
     }
 }
 
-void GrTextContext::drawTextAsPath(GrDrawContext* dc, GrRenderTarget* rt,
+void GrTextContext::drawTextAsPath(GrDrawContext* dc,
                                    const GrClip& clip,
                                    const SkPaint& skPaint, const SkMatrix& viewMatrix,
                                    const char text[], size_t byteLength, SkScalar x, SkScalar y,
@@ -179,14 +179,14 @@
         matrix.postTranslate(xpos - prevXPos, 0);
         if (iterPath) {
             const SkPaint& pnt = iter.getPaint();
-            GrBlurUtils::drawPathWithMaskFilter(fContext, dc, rt, clip, *iterPath,
+            GrBlurUtils::drawPathWithMaskFilter(fContext, dc, clip, *iterPath,
                                                 pnt, viewMatrix, &matrix, clipBounds, false);
         }
         prevXPos = xpos;
     }
 }
 
-void GrTextContext::drawPosTextAsPath(GrDrawContext* dc, GrRenderTarget* rt,
+void GrTextContext::drawPosTextAsPath(GrDrawContext* dc,
                                       const GrClip& clip,
                                       const SkPaint& origPaint, const SkMatrix& viewMatrix,
                                       const char text[], size_t byteLength,
@@ -227,7 +227,7 @@
 
                 matrix[SkMatrix::kMTransX] = loc.fX;
                 matrix[SkMatrix::kMTransY] = loc.fY;
-                GrBlurUtils::drawPathWithMaskFilter(fContext, dc, rt, clip, *path, paint,
+                GrBlurUtils::drawPathWithMaskFilter(fContext, dc, clip, *path, paint,
                                                     viewMatrix, &matrix, clipBounds, false);
             }
         }