update dox that we ignore the exact parameter on computeBounds

Change-Id: I6051210ea2a73b4d1c6cd631a285209ab130b4e5

diff --git a/core/jni/android/graphics/Path.cpp b/core/jni/android/graphics/Path.cpp
index 11c608c..b8b2a10 100644 (file)
--- a/core/jni/android/graphics/Path.cpp
+++ b/core/jni/android/graphics/Path.cpp
@@ -75,7 +75,7 @@ public:
         return result;
     }
  
-    static void computeBounds(JNIEnv* env, jobject clazz, SkPath* obj, jobject bounds, int boundstype) {
+    static void computeBounds(JNIEnv* env, jobject clazz, SkPath* obj, jobject bounds) {
         const SkRect& bounds_ = obj->getBounds();
         GraphicsJNI::rect_to_jrectf(bounds_, env, bounds);
     }
@@ -267,7 +267,7 @@ static JNINativeMethod methods[] = {
     {"native_setFillType","(II)V", (void*) SkPathGlue::setFillType},
     {"native_isEmpty","(I)Z", (void*) SkPathGlue::isEmpty},
     {"native_isRect","(ILandroid/graphics/RectF;)Z", (void*) SkPathGlue::isRect},
-    {"native_computeBounds","(ILandroid/graphics/RectF;I)V", (void*) SkPathGlue::computeBounds},
+    {"native_computeBounds","(ILandroid/graphics/RectF;)V", (void*) SkPathGlue::computeBounds},
     {"native_incReserve","(II)V", (void*) SkPathGlue::incReserve},
     {"native_moveTo","(IFF)V", (void*) SkPathGlue::moveTo__FF},
     {"native_rMoveTo","(IFF)V", (void*) SkPathGlue::rMoveTo},

diff --git a/graphics/java/android/graphics/Path.java b/graphics/java/android/graphics/Path.java
index c3f63d7..281823a 100644 (file)
--- a/graphics/java/android/graphics/Path.java
+++ b/graphics/java/android/graphics/Path.java
@@ -153,16 +153,15 @@ public class Path {
     }
 
     /**
-     * Compute the bounds of the path, and write the answer into bounds. If the
-     * path contains 0 or 1 points, the bounds is set to (0,0,0,0)
+     * Compute the bounds of the control points of the path, and write the
+     * answer into bounds. If the path contains 0 or 1 points, the bounds is
+     * set to (0,0,0,0)
      *
-     * @param bounds Returns the computed bounds of the path
-     * @param exact If true, return the exact (but slower) bounds, else return
-     *              just the bounds of all control points
+     * @param bounds Returns the computed bounds of the path's control points.
+     * @param exact This parameter is no longer used.
      */
     public void computeBounds(RectF bounds, boolean exact) {
-        // 1-exact, 0-fast correspond to the values in SkPath.h
-        native_computeBounds(mNativePath, bounds, exact ? 1 : 0);
+        native_computeBounds(mNativePath, bounds);
     }
 
     /**
@@ -552,8 +551,7 @@ public class Path {
     private static native void native_setFillType(int nPath, int ft);
     private static native boolean native_isEmpty(int nPath);
     private static native boolean native_isRect(int nPath, RectF rect);
-    private static native void native_computeBounds(int nPath, RectF bounds,
-                                                    int btype);
+    private static native void native_computeBounds(int nPath, RectF bounds);
     private static native void native_incReserve(int nPath, int extraPtCount);
     private static native void native_moveTo(int nPath, float x, float y);
     private static native void native_rMoveTo(int nPath, float dx, float dy);