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

Unified Diff: src/core/SkPath.cpp

Issue 926693002: Remove android specific srcPath from SkPath (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: remove test case Created 5 years, 10 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 | « include/core/SkPath.h ('k') | tests/PathTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkPath.cpp
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 4f5fffb7dd18ae966d9ab5c58c03b22e15979d11..c793396b560db50b02c75ad3e76dd577cc9e16bf 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -125,11 +125,7 @@ private:
#define INITIAL_LASTMOVETOINDEX_VALUE ~0
SkPath::SkPath()
- : fPathRef(SkPathRef::CreateEmpty())
-#ifdef SK_BUILD_FOR_ANDROID
- , fSourcePath(NULL)
-#endif
-{
+ : fPathRef(SkPathRef::CreateEmpty()) {
this->resetFields();
fIsVolatile = false;
}
@@ -148,9 +144,6 @@ void SkPath::resetFields() {
SkPath::SkPath(const SkPath& that)
: fPathRef(SkRef(that.fPathRef.get())) {
this->copyFields(that);
-#ifdef SK_BUILD_FOR_ANDROID
- fSourcePath = that.fSourcePath;
-#endif
SkDEBUGCODE(that.validate();)
}
@@ -164,9 +157,6 @@ SkPath& SkPath::operator=(const SkPath& that) {
if (this != &that) {
fPathRef.reset(SkRef(that.fPathRef.get()));
this->copyFields(that);
-#ifdef SK_BUILD_FOR_ANDROID
- fSourcePath = that.fSourcePath;
-#endif
}
SkDEBUGCODE(this->validate();)
return *this;
@@ -198,9 +188,6 @@ void SkPath::swap(SkPath& that) {
SkTSwap<uint8_t>(fConvexity, that.fConvexity);
SkTSwap<uint8_t>(fDirection, that.fDirection);
SkTSwap<SkBool8>(fIsVolatile, that.fIsVolatile);
-#ifdef SK_BUILD_FOR_ANDROID
- SkTSwap<const SkPath*>(fSourcePath, that.fSourcePath);
-#endif
}
}
@@ -308,23 +295,13 @@ bool SkPath::conservativelyContainsRect(const SkRect& rect) const {
uint32_t SkPath::getGenerationID() const {
uint32_t genID = fPathRef->genID();
-#ifdef SK_BUILD_FOR_ANDROID
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
SkASSERT((unsigned)fFillType < (1 << (32 - kPathRefGenIDBitCnt)));
genID |= static_cast<uint32_t>(fFillType) << kPathRefGenIDBitCnt;
#endif
return genID;
}
-#ifdef SK_BUILD_FOR_ANDROID
-const SkPath* SkPath::getSourcePath() const {
- return fSourcePath;
-}
-
-void SkPath::setSourcePath(const SkPath* path) {
- fSourcePath = path;
-}
-#endif
-
void SkPath::reset() {
SkDEBUGCODE(this->validate();)
« no previous file with comments | « include/core/SkPath.h ('k') | tests/PathTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698