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

This CL addresses "SkCanvas::save flags are not respected by GPU backend" (https://code.google.com/p/skia/issues/detail?id=1503).

Browse Source 
R=reed@google.com, bsalomon@google.com

Author: robertphillips@google.com

Review URL: https://chromiumcodereview.appspot.com/22947003

git-svn-id: http://skia.googlecode.com/svn/trunk@10762 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2013-08-16 00:53:34 +00:00
parent 8f4269725b
commit 6c157640c2
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/core/SkDeque.h
View File

@ -81,7 +81,7 @@ public:
void reset(const SkDeque& d, IterStart startLoc);
private:
SkDeque::Block* fCurBlock;
SkDeque::Block* fCurBlock;
char* fPos;
size_t fElemSize;
};

13
src/core/SkCanvas.cpp
View File

@ -214,6 +214,7 @@ private:
class SkCanvas::MCRec {
public:
MCRec* fNext;
int fFlags;
SkMatrix* fMatrix; // points to either fMatrixStorage or prev MCRec
SkRasterClip* fRasterClip; // points to either fRegionStorage or prev MCRec
SkDrawFilter* fFilter; // the current filter (or null)
@ -227,7 +228,7 @@ public:
*/
DeviceCM* fTopLayer;
MCRec(const MCRec* prev, int flags) {
MCRec(const MCRec* prev, int flags) : fFlags(flags) {
if (NULL != prev) {
if (flags & SkCanvas::kMatrix_SaveFlag) {
fMatrixStorage = *prev->fMatrix;
@ -720,8 +721,9 @@ int SkCanvas::internalSave(SaveFlags flags) {
newTop->fNext = fMCRec;
fMCRec = newTop;
fClipStack.save();
SkASSERT(fClipStack.getSaveCount() == this->getSaveCount() - 1);
if (SkCanvas::kClip_SaveFlag & flags) {
fClipStack.save();
}
return saveCount;
}
@ -896,7 +898,10 @@ void SkCanvas::internalRestore() {
fDeviceCMDirty = true;
fLocalBoundsCompareTypeDirty = true;
fClipStack.restore();
if (SkCanvas::kClip_SaveFlag & fMCRec->fFlags) {
fClipStack.restore();
}
// reserve our layer (if any)
DeviceCM* layer = fMCRec->fLayer; // may be null
// now detach it from fMCRec so we can pop(). Gets freed after its drawn