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

Sanitizing source files in Skia_Periodic_House_Keeping

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@6669 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2012-12-05 02:01:21 +00:00
parent b1c8827321
commit 73b140a9f6
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gm/dashing.cpp
View File

@ -185,8 +185,8 @@ protected:
// Draw a 100x100 block of dashed lines. The horizontal ones are BW // Draw a 100x100 block of dashed lines. The horizontal ones are BW
// while the vertical ones are AA. // while the vertical ones are AA.
void drawDashedLines(SkCanvas* canvas, void drawDashedLines(SkCanvas* canvas,
SkScalar lineLength, SkScalar lineLength,
SkScalar phase, SkScalar phase,
SkScalar dashLength, SkScalar dashLength,
int strokeWidth, int strokeWidth,
@ -284,7 +284,7 @@ protected:
// 3on/3off 3x1 rects - should use rect fast path regardless of phase // 3on/3off 3x1 rects - should use rect fast path regardless of phase
for (int phase = 0; phase <= 3; ++phase) { for (int phase = 0; phase <= 3; ++phase) {
canvas->save(); canvas->save();
canvas->translate(SkIntToScalar(phase*110+2), canvas->translate(SkIntToScalar(phase*110+2),
SkIntToScalar(330)); SkIntToScalar(330));
this->drawDashedLines(canvas, 100, SkIntToScalar(phase), SkIntToScalar(3), 1, false); this->drawDashedLines(canvas, 100, SkIntToScalar(phase), SkIntToScalar(3), 1, false);
canvas->restore(); canvas->restore();

4
gm/pathinterior.cpp
View File

@ -49,7 +49,7 @@ protected:
paint.setStyle(SkPaint::kStroke_Style); paint.setStyle(SkPaint::kStroke_Style);
paint.setColor(SK_ColorRED); paint.setColor(SK_ColorRED);
canvas->drawPath(path, paint); canvas->drawPath(path, paint);
if (hasInterior) { if (hasInterior) {
paint.setStyle(SkPaint::kFill_Style); paint.setStyle(SkPaint::kFill_Style);
paint.setColor(0x8800FF00); paint.setColor(0x8800FF00);
@ -89,7 +89,7 @@ protected:
SkScalar dy = (i % 4) * rect.height() * 6 / 5; SkScalar dy = (i % 4) * rect.height() * 6 / 5;
i++; i++;
path.offset(dx, dy); path.offset(dx, dy);
this->show(canvas, path); this->show(canvas, path);
} }
} }

2
src/gpu/GrClipMaskManager.cpp
View File

@ -280,7 +280,7 @@ void GrReduceClipStack(const SkClipStack& stack,
} else { } else {
int clipsToSkip = 0; int clipsToSkip = 0;
Element* element = result->headIter().get(); Element* element = result->headIter().get();
while (NULL != element) { while (NULL != element) {
bool skippable = false; bool skippable = false;
switch (element->getOp()) { switch (element->getOp()) {
case SkRegion::kDifference_Op: case SkRegion::kDifference_Op:

2
src/gpu/GrClipMaskManager.h
View File

@ -168,7 +168,7 @@ enum InitialState {
}; };
/** /**
* This function takes a clip stack and a query rectangle and it produces a reduced set of * This function takes a clip stack and a query rectangle and it produces a reduced set of
* SkClipStack::Elements that are equivalent to applying the full stack to the rectangle. The * SkClipStack::Elements that are equivalent to applying the full stack to the rectangle. The
* initial state of the query rectangle before the first clip element is applied is returned via * initial state of the query rectangle before the first clip element is applied is returned via
* initialState. This function is declared here so that it can be unit-tested. It may become a * initialState. This function is declared here so that it can be unit-tested. It may become a

2
tests/ClipStackTest.cpp
View File

@ -555,7 +555,7 @@ static void add_elem_to_region(const SkClipStack::Element& element,
elemRegion.setPath(element.getPath(), boundsRgn); elemRegion.setPath(element.getPath(), boundsRgn);
break; break;
case SkClipStack::Element::kEmpty_Type: case SkClipStack::Element::kEmpty_Type:
// //
region->setEmpty(); region->setEmpty();
return; return;
} }