aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/utils
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-03-17 19:47:40 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-03-17 19:47:40 +0000
commitbab3fc4c90c4369c5d77d8da86d9f117ee54e0bc (patch)
tree12a8a698fcc7e3c7136a367a0fd4972cdad74562 /src/utils
parentecb745dba75dde72e5edde72e4b309120e66033b (diff)
Revert of Add nine patch type to SkRRect. (https://codereview.chromium.org/196343015/)
Reason for revert: causes tests to have infinite loop Original issue's description: > Add nine patch type to SkRRect. > > BUG=skia:2181 > > Committed: http://code.google.com/p/skia/source/detail?r=13833 R=robertphillips@google.com, reed@google.com TBR=reed@google.com, robertphillips@google.com NOTREECHECKS=true NOTRY=true BUG=skia:2181 Author: bsalomon@google.com Review URL: https://codereview.chromium.org/202163004 git-svn-id: http://skia.googlecode.com/svn/trunk@13837 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/SkLua.cpp1
-rw-r--r--src/utils/debugger/SkObjectParser.cpp2
2 files changed, 0 insertions, 3 deletions
diff --git a/src/utils/SkLua.cpp b/src/utils/SkLua.cpp
index 44f2211b8f..4b87458923 100644
--- a/src/utils/SkLua.cpp
+++ b/src/utils/SkLua.cpp
@@ -1208,7 +1208,6 @@ static const char* rrect_type(const SkRRect& rr) {
case SkRRect::kRect_Type: return "rect";
case SkRRect::kOval_Type: return "oval";
case SkRRect::kSimple_Type: return "simple";
- case SkRRect::kNinePatch_Type: return "nine-patch";
case SkRRect::kComplex_Type: return "complex";
}
SkDEBUGFAIL("never get here");
diff --git a/src/utils/debugger/SkObjectParser.cpp b/src/utils/debugger/SkObjectParser.cpp
index a3b208544e..028300c5a5 100644
--- a/src/utils/debugger/SkObjectParser.cpp
+++ b/src/utils/debugger/SkObjectParser.cpp
@@ -241,8 +241,6 @@ SkString* SkObjectParser::RRectToString(const SkRRect& rrect, const char* title)
mRRect->append("oval");
} else if (rrect.isSimple()) {
mRRect->append("simple");
- } else if (rrect.isNinePatch()) {
- mRRect->append("nine-patch");
} else {
SkASSERT(rrect.isComplex());
mRRect->append("complex");