Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Unified Diff: include/core/SkPath.h

Issue 22471002: Restore SkPath(const SkPath&) to copy the generation ID on Android. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: fix asserts Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/core/SkPath.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkPath.h
diff --git a/include/core/SkPath.h b/include/core/SkPath.h
index d4b79cda0443cd73417dde72e9d3a6f786737e01..be15a63c8901686724b390703e86b8a3728c4faa 100644
--- a/include/core/SkPath.h
+++ b/include/core/SkPath.h
@@ -40,11 +40,10 @@ public:
SK_DECLARE_INST_COUNT_ROOT(SkPath);
SkPath();
- SkPath(const SkPath&);
+ SkPath(const SkPath&); // Copies fGenerationID on Android.
~SkPath();
- SkPath& operator=(const SkPath&);
-
+ SkPath& operator=(const SkPath&); // Increments fGenerationID on Android.
friend SK_API bool operator==(const SkPath&, const SkPath&);
friend bool operator!=(const SkPath& a, const SkPath& b) {
return !(a == b);
@@ -167,14 +166,12 @@ public:
/** Clear any lines and curves from the path, making it empty. This frees up
internal storage associated with those segments.
- This does NOT change the fill-type setting nor isConvex
*/
void reset();
/** Similar to reset(), in that all lines and curves are removed from the
path. However, any internal storage for those lines/curves is retained,
making reuse of the path potentially faster.
- This does NOT change the fill-type setting nor isConvex
*/
void rewind();
@@ -965,8 +962,7 @@ private:
/** Sets all fields other than fPathRef to the values in 'that'.
* Assumes the caller has already set fPathRef.
- * On Android increments fGenerationID without copying it.
- * On Android sets fSourcePath to NULL.
+ * Doesn't change fGenerationID or fSourcePath on Android.
*/
void copyFields(const SkPath& that);
« no previous file with comments | « no previous file | src/core/SkPath.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698