commit 0418a888d31689f5358b6b90fd09287aeba368db
author Cary Clark <caryclark@google.com> Wed May 10 09:07:42 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 10 14:22:58 2017 +0000
tree b255681de24473c3e70937b6cf76e894573aa446
parent 1ffda0484d87cd44afcd7387618f4a369ba3cd23

add parameter names

Functions in SkPaint and SkCanvas are easier to write
about when all of their parameters are named.

Also, move GlyphCacheProc to private since the only
interface that returns it is already in private.

R=reed@google.com

Change-Id: Iaea46213d5614d564c1c3de99e6f96c5efaec4b1
Reviewed-on: https://skia-review.googlesource.com/16175
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>

include/core/SkPaint.h

diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 43bacbe..1d99e40 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -49,8 +49,8 @@
     SkPaint(SkPaint&& paint);
     ~SkPaint();
 
-    SkPaint& operator=(const SkPaint&);
-    SkPaint& operator=(SkPaint&&);
+    SkPaint& operator=(const SkPaint& paint);
+    SkPaint& operator=(SkPaint&& paint);
 
     /** operator== may give false negatives: two paints that draw equivalently
         may return false.  It will never give false positives: two paints that
@@ -66,8 +66,8 @@
      */
     uint32_t getHash() const;
 
-    void flatten(SkWriteBuffer&) const;
-    void unflatten(SkReadBuffer&);
+    void flatten(SkWriteBuffer& buffer) const;
+    void unflatten(SkReadBuffer& buffer);
 
     /** Restores the paint to its initial settings.
     */
@@ -234,7 +234,7 @@
      *  X values, and drawText will places its glyphs vertically rather than
      *  horizontally.
      */
-    void setVerticalText(bool);
+    void setVerticalText(bool verticalText);
 
     /** Helper for getFlags(), returns true if kFakeBoldText_Flag bit is set
         @return true if the kFakeBoldText_Flag bit is set in the paint's flags.
@@ -485,7 +485,7 @@
      *  If shader is not NULL, its reference count is incremented.
      *  @param shader   May be NULL. The shader to be installed in the paint
      */
-    void setShader(sk_sp<SkShader>);
+    void setShader(sk_sp<SkShader> shader);
 
     /** Get the paint's colorfilter. If there is a colorfilter, its reference
         count is not changed.
@@ -500,7 +500,7 @@
         If filter is not NULL, its reference count is incremented.
         @param filter   May be NULL. The filter to be installed in the paint
     */
-    void setColorFilter(sk_sp<SkColorFilter>);
+    void setColorFilter(sk_sp<SkColorFilter> colorFilter);
 
     SkBlendMode getBlendMode() const { return (SkBlendMode)fBlendMode; }
     bool isSrcOver() const { return (SkBlendMode)fBlendMode == SkBlendMode::kSrcOver; }
@@ -524,7 +524,7 @@
                         paint
         @return         effect
     */
-    void setPathEffect(sk_sp<SkPathEffect>);
+    void setPathEffect(sk_sp<SkPathEffect> pathEffect);
 
     /** Get the paint's maskfilter object.
         <p />
@@ -544,7 +544,7 @@
                             the paint
         @return             maskfilter
     */
-    void setMaskFilter(sk_sp<SkMaskFilter>);
+    void setMaskFilter(sk_sp<SkMaskFilter> maskFilter);
 
     // These attributes are for text/fonts
 
@@ -567,7 +567,7 @@
                         paint
         @return         typeface
     */
-    void setTypeface(sk_sp<SkTypeface>);
+    void setTypeface(sk_sp<SkTypeface> typeface);
 
     /** Get the paint's rasterizer (or NULL).
         <p />
@@ -588,11 +588,11 @@
                           the paint.
         @return           rasterizer
     */
-    void setRasterizer(sk_sp<SkRasterizer>);
+    void setRasterizer(sk_sp<SkRasterizer> rasterizer);
 
     SkImageFilter* getImageFilter() const { return fImageFilter.get(); }
     sk_sp<SkImageFilter> refImageFilter() const;
-    void setImageFilter(sk_sp<SkImageFilter>);
+    void setImageFilter(sk_sp<SkImageFilter> imageFilter);
 
     /**
      *  Return the paint's SkDrawLooper (if any). Does not affect the looper's
@@ -611,9 +611,9 @@
      *  incremented.
      *  @param looper May be NULL. The new looper to be installed in the paint.
      */
-    void setDrawLooper(sk_sp<SkDrawLooper>);
+    void setDrawLooper(sk_sp<SkDrawLooper> drawLooper);
 
-    void setLooper(sk_sp<SkDrawLooper>);
+    void setLooper(sk_sp<SkDrawLooper> drawLooper);
 
     enum Align {
         kLeft_Align,
@@ -1009,13 +1009,15 @@
     // Take the style explicitly, so the caller can force us to be stroked
     // without having to make a copy of the paint just to change that field.
     const SkRect& doComputeFastBounds(const SkRect& orig, SkRect* storage,
-                                      Style) const;
+                                      Style style) const;
 
-    typedef const SkGlyph& (*GlyphCacheProc)(SkGlyphCache*, const char**);
+
 
     SK_TO_STRING_NONVIRT()
 
 private:
+    typedef const SkGlyph& (*GlyphCacheProc)(SkGlyphCache*, const char**);
+
     sk_sp<SkTypeface>     fTypeface;
     sk_sp<SkPathEffect>   fPathEffect;
     sk_sp<SkShader>       fShader;