commit 0fedb19812f05fcf18d16f0e96000768f4f76b11
author jvanverth <jvanverth@google.com> Wed Oct 08 09:07:27 2014 -0700
committer Commit bot <commit-bot@chromium.org> Wed Oct 08 09:07:27 2014 -0700
tree 05282555f6edd1d8ae9957c31769191084a8cdbb
parent e97d82b6e58f417546c738edba40e7ede4f41ea3

Rearrange code in TextContexts to be more consistent and match style guide.

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

src/gpu/GrTextContext.h

diff --git a/src/gpu/GrTextContext.h b/src/gpu/GrTextContext.h
index da41c1b..b82a648 100644
--- a/src/gpu/GrTextContext.h
+++ b/src/gpu/GrTextContext.h
@@ -24,6 +24,9 @@
 class GrTextContext {
 public:
     virtual ~GrTextContext() {}
+
+    virtual bool canDraw(const SkPaint& paint) = 0;
+
     virtual void drawText(const GrPaint&, const SkPaint&, const char text[], size_t byteLength,
                           SkScalar x, SkScalar y) = 0;
     virtual void drawPosText(const GrPaint&, const SkPaint&,
@@ -31,18 +34,7 @@
                              const SkScalar pos[], int scalarsPerPosition,
                              const SkPoint& offset) = 0;
 
-    virtual bool canDraw(const SkPaint& paint) = 0;
-
 protected:
-    GrTextContext(GrContext*, const SkDeviceProperties&);
-
-    static GrFontScaler* GetGrFontScaler(SkGlyphCache* cache);
-    static void MeasureText(SkGlyphCache* cache, SkDrawCacheProc glyphCacheProc,
-                            const char text[], size_t byteLength, SkVector* stopVector);
-
-    void init(const GrPaint&, const SkPaint&);
-    void finish() { fDrawTarget = NULL; }
-
     GrContext*         fContext;
     SkDeviceProperties fDeviceProperties;
 
@@ -50,6 +42,15 @@
     SkIRect            fClipRect;
     GrPaint            fPaint;
     SkPaint            fSkPaint;
+
+    GrTextContext(GrContext*, const SkDeviceProperties&);
+
+    void init(const GrPaint&, const SkPaint&);
+    void finish() { fDrawTarget = NULL; }
+
+    static GrFontScaler* GetGrFontScaler(SkGlyphCache* cache);
+    static void MeasureText(SkGlyphCache* cache, SkDrawCacheProc glyphCacheProc,
+                            const char text[], size_t byteLength, SkVector* stopVector);
 };
 
 #endif