comment SK_API and add fix params

I thought that SK_API on operator== was
redundant with SK_API on the enclosing class,
and was not needed. Turns out for mac_chromium_debug_ng
it is needed. Added comments for history.

Meanwhile, bookmaker found some missing and
mis-named parameters, so all is not lost.

R=reed@google.com

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

diff --git a/include/core/SkMatrix.h b/include/core/SkMatrix.h
index d408fb1..1752f26 100644 (file)
--- a/include/core/SkMatrix.h
+++ b/include/core/SkMatrix.h
@@ -621,6 +621,7 @@ public:
         return 0 == memcmp(fMat, m.fMat, sizeof(fMat));
     }
 
+    // mac chromium dbg requires SK_API to make operator== visible
     friend SK_API bool operator==(const SkMatrix& a, const SkMatrix& b);
     friend SK_API bool operator!=(const SkMatrix& a, const SkMatrix& b) {
         return !(a == b);

diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 464e535..3a10c87 100644 (file)
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -56,6 +56,7 @@ public:
         may return false.  It will never give false positives: two paints that
         are not equivalent always return false.
     */
+    // cc_unittests requires SK_API to make operator== visible
     SK_API friend bool operator==(const SkPaint& a, const SkPaint& b);
     friend bool operator!=(const SkPaint& a, const SkPaint& b) {
         return !(a == b);

diff --git a/include/core/SkPath.h b/include/core/SkPath.h
index d5b02c0..3311aae 100644 (file)
--- a/include/core/SkPath.h
+++ b/include/core/SkPath.h
@@ -36,11 +36,12 @@ public:
     };
 
     SkPath();
-    SkPath(const SkPath&);
+    SkPath(const SkPath& path);
     ~SkPath();
 
-    SkPath& operator=(const SkPath&);
-    friend  SK_API bool operator==(const SkPath&, const SkPath&);
+    SkPath& operator=(const SkPath& path);
+    // mac chromium dbg requires SK_API to make operator== visible
+    friend SK_API bool operator==(const SkPath& a, const SkPath& b);
     friend bool operator!=(const SkPath& a, const SkPath& b) {
         return !(a == b);
     }
@@ -150,7 +151,7 @@ public:
      *  changed (e.g. lineTo(), addRect(), etc.) then the cached value will be
      *  reset to kUnknown_Convexity.
      */
-    void setConvexity(Convexity);
+    void setConvexity(Convexity convexity);
 
     /**
      *  Returns true if the path is flagged as being convex. This is not a
@@ -521,17 +522,17 @@ public:
         current point on this contour. If there is no previous point, then a
         moveTo(0,0) is inserted automatically.
 
-        @param dx1   The amount to add to the x-coordinate of the last point on
+        @param x1   The amount to add to the x-coordinate of the last point on
                 this contour, to specify the 1st control point of a cubic curve
-        @param dy1   The amount to add to the y-coordinate of the last point on
+        @param y1   The amount to add to the y-coordinate of the last point on
                 this contour, to specify the 1st control point of a cubic curve
-        @param dx2   The amount to add to the x-coordinate of the last point on
+        @param x2   The amount to add to the x-coordinate of the last point on
                 this contour, to specify the 2nd control point of a cubic curve
-        @param dy2   The amount to add to the y-coordinate of the last point on
+        @param y2   The amount to add to the y-coordinate of the last point on
                 this contour, to specify the 2nd control point of a cubic curve
-        @param dx3   The amount to add to the x-coordinate of the last point on
+        @param x3   The amount to add to the x-coordinate of the last point on
                      this contour, to specify the end point of a cubic curve
-        @param dy3   The amount to add to the y-coordinate of the last point on
+        @param y3   The amount to add to the y-coordinate of the last point on
                      this contour, to specify the end point of a cubic curve
     */
     void rCubicTo(SkScalar x1, SkScalar y1, SkScalar x2, SkScalar y2,
@@ -1084,7 +1085,7 @@ public:
      */
     bool contains(SkScalar x, SkScalar y) const;
 
-    void dump(SkWStream* , bool forceClose, bool dumpAsHex) const;
+    void dump(SkWStream* stream, bool forceClose, bool dumpAsHex) const;
     void dump() const;
     void dumpHex() const;