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@12208 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-11-09 07:02:23 +00:00
parent 771b537fec
commit ed000840d4
2 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gm/bleed.cpp
View File

@ -18,7 +18,7 @@
// around the outside edge. The inner ring is red and the outer ring is blue.
static void make_ringed_bitmap(SkBitmap* result, int width, int height) {
SkASSERT(0 == width % 2 && 0 == height % 2);
static const SkPMColor kRed = SkPreMultiplyColor(SK_ColorRED);
static const SkPMColor kBlue = SkPreMultiplyColor(SK_ColorBLUE);
static const SkPMColor kBlack = SkPreMultiplyColor(SK_ColorBLACK);
@ -181,7 +181,7 @@ protected:
// Currently there are no test cases with medium filtering since medium uses mip-mapping and
// these draws are always upscaling.
// First draw a column with no bleeding, tiling, or filtering
this->drawCase1(canvas, kCol0X, kRow0Y, SkCanvas::kNone_DrawBitmapRectFlag, SkPaint::kNone_FilterLevel);
this->drawCase2(canvas, kCol0X, kRow1Y, SkCanvas::kNone_DrawBitmapRectFlag, SkPaint::kNone_FilterLevel);
@ -199,7 +199,7 @@ protected:
this->drawCase2(canvas, kCol2X, kRow1Y, SkCanvas::kNone_DrawBitmapRectFlag, SkPaint::kHigh_FilterLevel);
this->drawCase3(canvas, kCol2X, kRow2Y, SkCanvas::kNone_DrawBitmapRectFlag, SkPaint::kHigh_FilterLevel);
this->drawCase4(canvas, kCol2X, kRow3Y, SkCanvas::kNone_DrawBitmapRectFlag, SkPaint::kHigh_FilterLevel);
#if SK_SUPPORT_GPU
GrContext* ctx = GM::GetGr(canvas);
int oldMaxTextureSize = 0;
@ -221,13 +221,13 @@ protected:
this->drawCase2(canvas, kCol4X, kRow1Y, SkCanvas::kNone_DrawBitmapRectFlag, SkPaint::kHigh_FilterLevel);
this->drawCase3(canvas, kCol4X, kRow2Y, SkCanvas::kNone_DrawBitmapRectFlag, SkPaint::kHigh_FilterLevel);
this->drawCase4(canvas, kCol4X, kRow3Y, SkCanvas::kNone_DrawBitmapRectFlag, SkPaint::kHigh_FilterLevel);
// Then draw a column with bleeding, tiling, and low filtering
this->drawCase1(canvas, kCol5X, kRow0Y, SkCanvas::kBleed_DrawBitmapRectFlag, SkPaint::kLow_FilterLevel);
this->drawCase2(canvas, kCol5X, kRow1Y, SkCanvas::kBleed_DrawBitmapRectFlag, SkPaint::kLow_FilterLevel);
this->drawCase3(canvas, kCol5X, kRow2Y, SkCanvas::kBleed_DrawBitmapRectFlag, SkPaint::kLow_FilterLevel);
this->drawCase4(canvas, kCol5X, kRow3Y, SkCanvas::kBleed_DrawBitmapRectFlag, SkPaint::kLow_FilterLevel);
// Finally draw a column with bleeding, tiling, and high filtering
this->drawCase1(canvas, kCol6X, kRow0Y, SkCanvas::kBleed_DrawBitmapRectFlag, SkPaint::kHigh_FilterLevel);
this->drawCase2(canvas, kCol6X, kRow1Y, SkCanvas::kBleed_DrawBitmapRectFlag, SkPaint::kHigh_FilterLevel);

92
tests/PathOpsSkpTest.cpp
View File

@ -1549,53 +1549,53 @@ static void skpgithub_io_26(skiatest::Reporter* reporter) {
testPathOp(reporter, path, pathB, kIntersect_PathOp);
}
static void skpskpicture14(skiatest::Reporter* reporter) {
SkPath path;
path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 994);
path.lineTo(0, 0);
path.lineTo(512, 0);
path.lineTo(512, 994);
path.lineTo(0, 994);
path.close();
SkPath pathB;
pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(-317, 168);
pathB.quadTo(-317, 166.757385f, -316.121338f, 165.878662f);
pathB.quadTo(-315.242645f, 165, -314, 165);
pathB.lineTo(320, 165);
pathB.quadTo(321.242615f, 165, 322.121338f, 165.878662f);
pathB.quadTo(323, 166.757385f, 323, 168);
pathB.lineTo(323, 193);
pathB.lineTo(-317, 193);
pathB.close();
testPathOp(reporter, path, pathB, kIntersect_PathOp);
}
static void skpskpicture14(skiatest::Reporter* reporter) {
SkPath path;
path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 994);
path.lineTo(0, 0);
path.lineTo(512, 0);
path.lineTo(512, 994);
path.lineTo(0, 994);
path.close();
SkPath pathB;
pathB.setFillType(SkPath::kWinding_FillType);
pathB.moveTo(-317, 168);
pathB.quadTo(-317, 166.757385f, -316.121338f, 165.878662f);
pathB.quadTo(-315.242645f, 165, -314, 165);
pathB.lineTo(320, 165);
pathB.quadTo(321.242615f, 165, 322.121338f, 165.878662f);
pathB.quadTo(323, 166.757385f, 323, 168);
pathB.lineTo(323, 193);
pathB.lineTo(-317, 193);
pathB.close();
testPathOp(reporter, path, pathB, kIntersect_PathOp);
}
#if TRY_SEPT_BROKEN_TESTS
static void skpskpicture15(skiatest::Reporter* reporter) {
SkPath path;
path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 193);
path.lineTo(323, 193);
path.lineTo(323, 168);
path.quadTo(323, 166.757385f, 322.121338f, 165.878662f);
path.quadTo(321.242615f, 165, 320, 165);
path.lineTo(0, 165);
path.lineTo(0, 193);
path.close();
SkPath pathB;
pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(-314, 165);
pathB.lineTo(320, 165);
pathB.cubicTo(321.65686f, 165, 323, 166.34314f, 323, 168);
pathB.lineTo(323, 192);
pathB.lineTo(-317, 192);
pathB.lineTo(-317, 168);
pathB.cubicTo(-317, 166.34314f, -315.65686f, 165, -314, 165);
pathB.close();
testPathOp(reporter, path, pathB, kIntersect_PathOp);
}
static void skpskpicture15(skiatest::Reporter* reporter) {
SkPath path;
path.setFillType(SkPath::kEvenOdd_FillType);
path.moveTo(0, 193);
path.lineTo(323, 193);
path.lineTo(323, 168);
path.quadTo(323, 166.757385f, 322.121338f, 165.878662f);
path.quadTo(321.242615f, 165, 320, 165);
path.lineTo(0, 165);
path.lineTo(0, 193);
path.close();
SkPath pathB;
pathB.setFillType(SkPath::kInverseWinding_FillType);
pathB.moveTo(-314, 165);
pathB.lineTo(320, 165);
pathB.cubicTo(321.65686f, 165, 323, 166.34314f, 323, 168);
pathB.lineTo(323, 192);
pathB.lineTo(-317, 192);
pathB.lineTo(-317, 168);
pathB.cubicTo(-317, 166.34314f, -315.65686f, 165, -314, 165);
pathB.close();
testPathOp(reporter, path, pathB, kIntersect_PathOp);
}
#endif
static void (*firstTest)(skiatest::Reporter* ) = 0;