increase coverage of SkPath.cpp, remove unused code

include/core/SkPath.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPath_DEFINED
@@ skipping 871 matching lines @@
 
     private:
         const SkPoint*  fPts;
         const uint8_t*  fVerbs;
         const uint8_t*  fVerbStop;
         const SkScalar* fConicWeights;
         SkPoint         fMoveTo;
         SkPoint         fLastPt;
     };
 
-    /**
-     *  Returns true if the point { x, y } is contained by the path, taking into
-     *  account the FillType.
-     */
-    bool contains(SkScalar x, SkScalar y) const;

[reed1, 2013/11/13 18:37:52]

This guy was written partly to optimize the code in webkit's SkiaUtils.cpp
SkPathContainsPoint. Obviously we haven't make that connection yet, but I think
we should.

[caryclark, 2013/11/13 18:52:37]

I can put it back. It isn't called today within Skia or Chrome; there are no
tests, and when I wrote a test, I discovered the code didn't work.

On the other hand, it could either be in, but commented out, or be retrieved in
the future from the repository if the current code is a good starting point.
Just let me know what you'd prefer.

[reed1, 2013/11/13 18:58:58]

Well, it was called, until you removed the GM that called it.

If you have a test that fails, lets add that to a bug, and I'll try to fix it.

-
     void dump(bool forceClose, const char title[] = NULL) const;
     void dump() const;
 
     /**
      *  Write the path to the buffer, and return the number of bytes written.
      *  If buffer is NULL, it still returns the number of bytes.
      */
     size_t writeToMemory(void* buffer) const;
     /**
      * Initializes the path from the buffer
@@ skipping 57 matching lines @@
 
     /** Sets all fields other than fPathRef to the values in 'that'.
      *  Assumes the caller has already set fPathRef.
      *  Doesn't change fGenerationID or fSourcePath on Android.
      */
     void copyFields(const SkPath& that);
 
     friend class Iter;
 
     friend class SkPathStroker;
-    /*  Append the first contour of path, ignoring path's initial point. If no
-        moveTo() call has been made for this contour, the first point is
-        automatically set to (0,0).
-    */
-    void pathTo(const SkPath& path);
 
     /*  Append, in reverse order, the first contour of path, ignoring path's
         last point. If no moveTo() call has been made for this contour, the
         first point is automatically set to (0,0).
     */
     void reversePathTo(const SkPath&);
 
     // called before we add points for lineTo, quadTo, cubicTo, checking to see
     // if we need to inject a leading moveTo first
     //
@@ skipping 22 matching lines @@
     void setBounds(const SkRect& rect) {
         fPathRef->setBounds(rect);
     }
 
 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TOO
     friend class SkPathRef;     // just for SerializationOffsets
 #endif
     friend class SkAutoPathBoundsUpdate;
     friend class SkAutoDisableOvalCheck;
     friend class SkAutoDisableDirectionCheck;
-    friend class SkBench_AddPathTest; // perf test pathTo/reversePathTo
+    friend class SkBench_AddPathTest; // perf test reversePathTo
+    friend class PathTest_Private; // unit test reversePathTo
 };
 
 #endif