diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-20 12:28:23 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-20 12:28:23 +0000 |
| commit | 4146413c96f84d74a9363df760db1125b5e608e6 (patch) | |
| tree | 656b48bd16aed0f3becc9902fb941bc4b1d96d30 /gm/bleed.cpp | |
| parent | 2e915b32347aa2c2bcf82aba57c325b8fb81ec53 (diff) | |
Fix merge problem between r10805 and 10803
git-svn-id: http://skia.googlecode.com/svn/trunk@10810 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/bleed.cpp')
| -rw-r--r-- | gm/bleed.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gm/bleed.cpp b/gm/bleed.cpp index 1a7e188ec1..fad5c0f18a 100644 --- a/gm/bleed.cpp +++ b/gm/bleed.cpp @@ -144,14 +144,14 @@ protected: canvas->clear(SK_ColorGRAY); // First draw a column with no bleeding, tiling, or filtering - this->drawCase1(canvas, kCol0X, kRow0Y, SkCanvas::kNone_DrawBitmapRectflag, false); - this->drawCase2(canvas, kCol0X, kRow1Y, SkCanvas::kNone_DrawBitmapRectflag, false); - this->drawCase3(canvas, kCol0X, kRow2Y, SkCanvas::kNone_DrawBitmapRectflag, false); + this->drawCase1(canvas, kCol0X, kRow0Y, SkCanvas::kNone_DrawBitmapRectFlag, false); + this->drawCase2(canvas, kCol0X, kRow1Y, SkCanvas::kNone_DrawBitmapRectFlag, false); + this->drawCase3(canvas, kCol0X, kRow2Y, SkCanvas::kNone_DrawBitmapRectFlag, false); // Then draw a column with no bleeding or tiling but with filtering - this->drawCase1(canvas, kCol1X, kRow0Y, SkCanvas::kNone_DrawBitmapRectflag, true); - this->drawCase2(canvas, kCol1X, kRow1Y, SkCanvas::kNone_DrawBitmapRectflag, true); - this->drawCase3(canvas, kCol1X, kRow2Y, SkCanvas::kNone_DrawBitmapRectflag, true); + this->drawCase1(canvas, kCol1X, kRow0Y, SkCanvas::kNone_DrawBitmapRectFlag, true); + this->drawCase2(canvas, kCol1X, kRow1Y, SkCanvas::kNone_DrawBitmapRectFlag, true); + this->drawCase3(canvas, kCol1X, kRow2Y, SkCanvas::kNone_DrawBitmapRectFlag, true); #if SK_SUPPORT_GPU @@ -165,9 +165,9 @@ protected: #endif // Then draw a column with no bleeding but with tiling and filtering - this->drawCase1(canvas, kCol2X, kRow0Y, SkCanvas::kNone_DrawBitmapRectflag, true); - this->drawCase2(canvas, kCol2X, kRow1Y, SkCanvas::kNone_DrawBitmapRectflag, true); - this->drawCase3(canvas, kCol2X, kRow2Y, SkCanvas::kNone_DrawBitmapRectflag, true); + this->drawCase1(canvas, kCol2X, kRow0Y, SkCanvas::kNone_DrawBitmapRectFlag, true); + this->drawCase2(canvas, kCol2X, kRow1Y, SkCanvas::kNone_DrawBitmapRectFlag, true); + this->drawCase3(canvas, kCol2X, kRow2Y, SkCanvas::kNone_DrawBitmapRectFlag, true); // Finally draw a column with all three (bleeding, tiling, and filtering) this->drawCase1(canvas, kCol3X, kRow0Y, SkCanvas::kBleed_DrawBitmapRectFlag, true); |