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

Sanitizing source files in Housekeeper-Nightly

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@12186 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-11-08 07:01:56 +00:00
parent 44fb865e81
commit ab7442c8d7
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bench/CoverageBench.cpp
View File

@ -43,12 +43,12 @@ public:
fDraw.fClip = &fRC.bwRgn();
fDraw.fRC = &fRC;
}
protected:
virtual const char* onGetName() SK_OVERRIDE {
return fName.c_str();
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
if (fDrawCoverage) {
for (int i = 0; i < this->getLoops(); ++i) {
@ -60,7 +60,7 @@ protected:
}
}
}
private:
typedef SkBenchmark INHERITED;
};

10
gm/bigblurs.cpp
View File

@ -14,7 +14,7 @@ namespace skiagm {
// This GM exercises the blurred rect nine-patching special cases when the
// blurred rect is very large and/or very far from the origin.
// It creates a large blurred rect/rectori then renders the 4 corners and the
// It creates a large blurred rect/rectori then renders the 4 corners and the
// middle.
class BigBlursGM : public GM {
public:
@ -70,21 +70,21 @@ protected:
for (int i = 0; i < 2; ++i) {
for (int j = 0; j < SkBlurMaskFilter::kBlurStyleCount; ++j) {
SkMaskFilter* mf = SkBlurMaskFilter::Create((SkBlurMaskFilter::BlurStyle)j,
SkMaskFilter* mf = SkBlurMaskFilter::Create((SkBlurMaskFilter::BlurStyle)j,
kSigma);
blurPaint.setMaskFilter(mf)->unref();
for (int k = 0; k < (int)SK_ARRAY_COUNT(origins); ++k) {
canvas->save();
SkRect clipRect = SkRect::MakeXYWH(SkIntToScalar(desiredX),
SkRect clipRect = SkRect::MakeXYWH(SkIntToScalar(desiredX),
SkIntToScalar(desiredY),
SkIntToScalar(kCloseUpSize),
SkIntToScalar(kCloseUpSize),
SkIntToScalar(kCloseUpSize));
canvas->clipRect(clipRect, SkRegion::kReplace_Op, false);
canvas->translate(desiredX-origins[k].fX,
canvas->translate(desiredX-origins[k].fX,
desiredY-origins[k].fY);
if (0 == i) {

2
src/core/SkBlitter.cpp
View File

@ -942,7 +942,7 @@ SkBlitter* SkBlitter::Choose(const SkBitmap& device,
return blitter;
}
switch (device.config()) {
case SkBitmap::kA1_Config:
SK_PLACEMENT_NEW_ARGS(blitter, SkA1_Blitter,

4
src/core/SkBlitter_A8.cpp
View File

@ -365,7 +365,7 @@ void SkA8_Coverage_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[],
uint8_t* device = fDevice.getAddr8(x, y);
SkDEBUGCODE(int totalCount = 0;)
for (;;) {
int count = runs[0];
SkASSERT(count >= 0);
@ -426,7 +426,7 @@ void SkA8_Coverage_Blitter::blitMask(const SkMask& mask, const SkIRect& clip) {
const uint8_t* src = mask.getAddr8(x, y);
const size_t srcRB = mask.fRowBytes;
const size_t dstRB = fDevice.rowBytes();
while (--height >= 0) {
memcpy(dst, src, width);
dst += dstRB;

1
src/opts/SkBitmapProcState_arm_neon.cpp
View File

@ -509,4 +509,3 @@ void platformConvolutionProcs_arm_neon(SkConvolutionProcs* procs) {
procs->fConvolveHorizontally = &convolveHorizontally_neon;
procs->fApplySIMDPadding = &applySIMDPadding_neon;
}