AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix calling undef inline func build error

Browse Source 
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
This commit is contained in:
commit-bot@chromium.org 2014-02-16 14:45:45 +00:00
parent e5b2af955b
commit 9cb671a001
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/core/SkClipStack.h
View File

@ -229,17 +229,7 @@ public:
void initPath(int saveCount, const SkPath& path, SkRegion::Op op, bool doAA);
void setEmpty() {
fType = kEmpty_Type;
fFiniteBound.setEmpty();
fFiniteBoundType = kNormal_BoundsType;
fIsIntersectionOfRects = false;
fRect.setEmpty();
fRRect.setEmpty();
fPath.reset();
fGenID = kEmptyGenID;
SkDEBUGCODE(this->checkEmpty();)
}
void setEmpty();
// All Element methods below are only used within SkClipStack.cpp
inline void checkEmpty() const;

17
src/core/SkCanvas.cpp
View File

@ -1417,13 +1417,6 @@ void SkCanvas::validateClip() const {
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 @@ void SkCanvas::validateClip() const {
case SkClipStack::Element::kEmpty_Type:
tmpClip.setEmpty();
break;
default: {
SkPath path;
element->asPath(&path);
clipPathHelper(this,
&tmpClip,
path,
element->getOp(),
element->isAA());
break;
}
}
}

12
src/core/SkClipStack.cpp
View File

@ -103,6 +103,18 @@ void SkClipStack::Element::asPath(SkPath* path) const {
}
}
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);