From 22ef2c37e65e601ba78851e3dbb4ca7a0e4c7d61 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Thu, 13 Feb 2014 03:01:57 +0000 Subject: [PATCH] Sanitizing source files in Housekeeper-Nightly git-svn-id: http://skia.googlecode.com/svn/trunk@13424 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/core/SkMatrixClipStateMgr.cpp | 8 ++++---- src/core/SkMatrixClipStateMgr.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/core/SkMatrixClipStateMgr.cpp b/src/core/SkMatrixClipStateMgr.cpp index dd485ca..4cf99bc 100644 --- a/src/core/SkMatrixClipStateMgr.cpp +++ b/src/core/SkMatrixClipStateMgr.cpp @@ -54,7 +54,7 @@ void SkMatrixClipStateMgr::writeDeltaMat(int currentMatID, int desiredMatID) { // Note: this only writes out the clips for the current save state. To get the // entire clip stack requires iterating of the entire matrix/clip stack. -void SkMatrixClipStateMgr::MatrixClipState::ClipInfo::writeClip(int* curMatID, +void SkMatrixClipStateMgr::MatrixClipState::ClipInfo::writeClip(int* curMatID, SkMatrixClipStateMgr* mgr, bool* overrideFirstOp) { for (int i = 0; i < fClips.count(); ++i) { @@ -81,15 +81,15 @@ void SkMatrixClipStateMgr::MatrixClipState::ClipInfo::writeClip(int* curMatID, switch (curClip.fClipType) { case kRect_ClipType: - curClip.fOffset = mgr->getPicRecord()->recordClipRect(curClip.fGeom.fRRect.rect(), + curClip.fOffset = mgr->getPicRecord()->recordClipRect(curClip.fGeom.fRRect.rect(), op, curClip.fDoAA); break; case kRRect_ClipType: - curClip.fOffset = mgr->getPicRecord()->recordClipRRect(curClip.fGeom.fRRect, op, + curClip.fOffset = mgr->getPicRecord()->recordClipRRect(curClip.fGeom.fRRect, op, curClip.fDoAA); break; case kPath_ClipType: - curClip.fOffset = mgr->getPicRecord()->recordClipPath(curClip.fGeom.fPathID, op, + curClip.fOffset = mgr->getPicRecord()->recordClipPath(curClip.fGeom.fPathID, op, curClip.fDoAA); break; case kRegion_ClipType: { diff --git a/src/core/SkMatrixClipStateMgr.h b/src/core/SkMatrixClipStateMgr.h index a07aedd..60f9fa0 100644 --- a/src/core/SkMatrixClipStateMgr.h +++ b/src/core/SkMatrixClipStateMgr.h @@ -147,7 +147,7 @@ public: int regionID, SkRegion::Op op, int matrixID); - void writeClip(int* curMatID, + void writeClip(int* curMatID, SkMatrixClipStateMgr* mgr, bool* overrideFirstOp); void fillInSkips(SkWriter32* writer, int32_t restoreOffset); @@ -370,8 +370,8 @@ protected: // This dictionary doesn't actually de-duplicate the matrices (except for the // identity matrix). It merely stores the matrices and allows them to be looked - // up by ID later. The de-duplication mainly falls upon the matrix/clip stack - // which stores the ID so a revisited clip/matrix (via popping the stack) will + // up by ID later. The de-duplication mainly falls upon the matrix/clip stack + // which stores the ID so a revisited clip/matrix (via popping the stack) will // use the same ID. SkTDArray fMatrixDict; @@ -388,7 +388,7 @@ protected: int addRegionToDict(const SkRegion& region); const SkRegion* lookupRegion(int index) { SkASSERT(index >= 0 && index < fRegionDict.count()); - return fRegionDict[index]; + return fRegionDict[index]; } // TODO: add stats to check if the dictionary really does -- 2.7.4