fix calling undef inline func build error
Fixes error introduced in https://code.google.com/p/skia/source/detail?r=13465
R=robertphillips@google.com
TBR=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/168893002
git-svn-id: http://skia.googlecode.com/svn/trunk@13466 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 2cc504f..7025e53 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -1417,13 +1417,6 @@
const SkClipStack::Element* element;
while ((element = iter.next()) != NULL) {
switch (element->getType()) {
- case SkClipStack::Element::kPath_Type:
- clipPathHelper(this,
- &tmpClip,
- element->getPath(),
- element->getOp(),
- element->isAA());
- break;
case SkClipStack::Element::kRect_Type:
element->getRect().round(&ir);
tmpClip.op(ir, element->getOp());
@@ -1431,6 +1424,16 @@
case SkClipStack::Element::kEmpty_Type:
tmpClip.setEmpty();
break;
+ default: {
+ SkPath path;
+ element->asPath(&path);
+ clipPathHelper(this,
+ &tmpClip,
+ path,
+ element->getOp(),
+ element->isAA());
+ break;
+ }
}
}
diff --git a/src/core/SkClipStack.cpp b/src/core/SkClipStack.cpp
index 17eb6f9..e501697 100644
--- a/src/core/SkClipStack.cpp
+++ b/src/core/SkClipStack.cpp
@@ -103,6 +103,18 @@
}
}
+void SkClipStack::Element::setEmpty() {
+ fType = kEmpty_Type;
+ fFiniteBound.setEmpty();
+ fFiniteBoundType = kNormal_BoundsType;
+ fIsIntersectionOfRects = false;
+ fRect.setEmpty();
+ fRRect.setEmpty();
+ fPath.reset();
+ fGenID = kEmptyGenID;
+ SkDEBUGCODE(this->checkEmpty();)
+}
+
void SkClipStack::Element::checkEmpty() const {
SkASSERT(fFiniteBound.isEmpty());
SkASSERT(kNormal_BoundsType == fFiniteBoundType);