Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@10992 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
parent
d1bcfc9a19
commit
6b00a1ec2a
@ -58,7 +58,7 @@ void SkDeviceLooper::mapMatrix(SkMatrix* dst, const SkMatrix& src) const {
|
||||
|
||||
bool SkDeviceLooper::computeCurrBitmapAndClip() {
|
||||
SkASSERT(kComplex_State == fState);
|
||||
|
||||
|
||||
SkIRect r = SkIRect::MakeXYWH(fCurrOffset.x(), fCurrOffset.y(),
|
||||
fDelta, fDelta);
|
||||
if (!fBaseBitmap.extractSubset(&fSubsetBitmap, r)) {
|
||||
@ -66,10 +66,10 @@ bool SkDeviceLooper::computeCurrBitmapAndClip() {
|
||||
return false;
|
||||
}
|
||||
fSubsetBitmap.lockPixels();
|
||||
|
||||
|
||||
fBaseRC.translate(-r.left(), -r.top(), &fSubsetRC);
|
||||
(void)fSubsetRC.op(SkIRect::MakeWH(fDelta, fDelta), SkRegion::kIntersect_Op);
|
||||
|
||||
|
||||
fCurrBitmap = &fSubsetBitmap;
|
||||
fCurrRC = &fSubsetRC;
|
||||
return true;
|
||||
@ -81,7 +81,7 @@ bool SkDeviceLooper::next() {
|
||||
// in theory, we should not get called here, since we must have
|
||||
// previously returned false, but we check anyway.
|
||||
break;
|
||||
|
||||
|
||||
case kSimple_State:
|
||||
// first time for simple
|
||||
if (NULL == fCurrBitmap) {
|
||||
@ -96,7 +96,7 @@ bool SkDeviceLooper::next() {
|
||||
case kComplex_State:
|
||||
// need to propogate fCurrOffset through clippedbounds
|
||||
// left to right, until we wrap around and move down
|
||||
|
||||
|
||||
if (fCurrOffset.x() + fDelta < fClippedBounds.right()) {
|
||||
fCurrOffset.fX += fDelta;
|
||||
return this->computeCurrBitmapAndClip();
|
||||
@ -108,7 +108,7 @@ bool SkDeviceLooper::next() {
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
fState = kDone_State;
|
||||
return false;
|
||||
}
|
||||
|
@ -51,7 +51,7 @@ public:
|
||||
|
||||
/**
|
||||
* Call next to setup the looper to return a valid coordinate chunk.
|
||||
* Each time this returns true, it is safe to call mapRect() and
|
||||
* Each time this returns true, it is safe to call mapRect() and
|
||||
* mapMatrix(), to convert from "global" coordinate values to ones that
|
||||
* are local to this chunk.
|
||||
*
|
||||
@ -89,7 +89,7 @@ private:
|
||||
bool fitsInDelta(const SkIRect& r) const {
|
||||
return r.right() < fDelta && r.bottom() < fDelta;
|
||||
}
|
||||
|
||||
|
||||
bool computeCurrBitmapAndClip();
|
||||
};
|
||||
|
||||
|
@ -2833,4 +2833,3 @@ bool SkDraw::DrawToMask(const SkPath& devPath, const SkIRect* clipBounds,
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -376,4 +376,3 @@ SkBlitRow::Proc32 SkBlitRow::PlatformProcs32(unsigned flags) {
|
||||
SkBlitRow::ColorProc SkBlitRow::PlatformColorProc() {
|
||||
return SK_ARM_NEON_WRAP(Color32_arm);
|
||||
}
|
||||
|
||||
|
@ -24,4 +24,3 @@ SkBlitRow::ColorProc SkBlitRow::PlatformColorProc() {
|
||||
SkBlitRow::ColorRectProc PlatformColorRectProcFactory() {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user