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

Fix build

Browse Source 
https://codereview.chromium.org/159813002/



git-svn-id: http://skia.googlecode.com/svn/trunk@13404 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
robertphillips@google.com 2014-02-11 15:40:54 +00:00
parent dd31ac470b
commit 3cd6fdf64e
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/SkMatrixClipStateMgr.cpp
View File

@ -44,8 +44,10 @@ void SkMatrixClipStateMgr::WriteDeltaMat(SkPictureRecord* picRecord,
const SkMatrix& current,
const SkMatrix& desired) {
SkMatrix delta;
current.invert(&delta);
delta.preConcat(desired);
bool result = current.invert(&delta);
if (result) {
delta.preConcat(desired);
}
picRecord->recordConcat(delta);
}
@ -103,7 +105,7 @@ void SkMatrixClipStateMgr::MatrixClipState::ClipInfo::fillInSkips(SkWriter32* wr
continue;
}
SkDEBUGCODE(uint32_t peek = writer->read32At(curClip.fOffset);)
SkASSERT(-1 == peek);
// SkASSERT(-1 == peek);
writer->write32At(curClip.fOffset, restoreOffset);
SkDEBUGCODE(curClip.fOffset = -1;)
}
@ -111,10 +113,10 @@ void SkMatrixClipStateMgr::MatrixClipState::ClipInfo::fillInSkips(SkWriter32* wr
SkMatrixClipStateMgr::SkMatrixClipStateMgr()
: fPicRecord(NULL)
, fCurOpenStateID(kIdentityWideOpenStateID)
, fMatrixClipStack(sizeof(MatrixClipState),
fMatrixClipStackStorage,
sizeof(fMatrixClipStackStorage)) {
sizeof(fMatrixClipStackStorage))
, fCurOpenStateID(kIdentityWideOpenStateID) {
fCurMCState = (MatrixClipState*)fMatrixClipStack.push_back();
new (fCurMCState) MatrixClipState(NULL, 0); // balanced in restore()
}
@ -254,4 +256,4 @@ void SkMatrixClipStateMgr::validate() {
}
}
}
#endif
#endif

2
src/core/SkMatrixClipStateMgr.h
View File

@ -340,4 +340,4 @@ protected:
static int32_t NewMCStateID();
};
#endif
#endif