diff options
| author |  skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-31 07:01:28 +0000 |
|---|---|---|
| committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-31 07:01:28 +0000 |
| commit | e0c170f7bbb8c16089274f2691f8484286fcbbe2 (patch) | |
| tree | f31e8b8d3176061a047c6331970453cca0830515 /src | |
| parent | 5852c8b06df9ed961526efb8df02bc00c87b9d4c (diff) | |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@11049 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkBitmapDevice.cpp | 5 | ||||
| -rw-r--r-- | src/core/SkDevice.cpp | 1 | ||||
| -rw-r--r-- | src/gpu/GrOvalRenderer.cpp | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/core/SkBitmapDevice.cpp b/src/core/SkBitmapDevice.cpp index 0c202592e3..eee201881a 100644 --- a/src/core/SkBitmapDevice.cpp +++ b/src/core/SkBitmapDevice.cpp @@ -112,8 +112,8 @@ bool SkBitmapDevice::onReadPixels(const SkBitmap& bitmap, SkCanvas::Config8888 config8888) { SkASSERT(SkBitmap::kARGB_8888_Config == bitmap.config()); SkASSERT(!bitmap.isNull()); - SkASSERT(SkIRect::MakeWH(this->width(), this->height()).contains(SkIRect::MakeXYWH(x, y, - bitmap.width(), + SkASSERT(SkIRect::MakeWH(this->width(), this->height()).contains(SkIRect::MakeXYWH(x, y, + bitmap.width(), bitmap.height()))); SkIRect srcRect = SkIRect::MakeXYWH(x, y, bitmap.width(), bitmap.height()); @@ -407,4 +407,3 @@ bool SkBitmapDevice::filterTextFlags(const SkPaint& paint, TextFlags* flags) { // we're cool with the paint as is return false; } - diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp index d53b8a2e12..c0d4ad3694 100644 --- a/src/core/SkDevice.cpp +++ b/src/core/SkDevice.cpp @@ -118,4 +118,3 @@ bool SkBaseDevice::readPixels(SkBitmap* bitmap, int x, int y, } return result; } - diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp index de7f4a36ef..6965f9e580 100644 --- a/src/gpu/GrOvalRenderer.cpp +++ b/src/gpu/GrOvalRenderer.cpp @@ -693,7 +693,7 @@ bool GrOvalRenderer::drawSimpleRRect(GrDrawTarget* target, GrContext* context, b bounds.outset(halfWidth, halfWidth); } - isStroked = (isStroked && innerRadius > 0); + isStroked = (isStroked && innerRadius > 0); GrEffectRef* effect = CircleEdgeEffect::Create(isStroked); static const int kCircleEdgeAttrIndex = 1; @@ -789,7 +789,7 @@ bool GrOvalRenderer::drawSimpleRRect(GrDrawTarget* target, GrContext* context, b bounds.outset(scaledStroke.fX, scaledStroke.fY); } - isStroked = (isStroked && innerXRadius > 0 && innerYRadius > 0); + isStroked = (isStroked && innerXRadius > 0 && innerYRadius > 0); GrDrawTarget::AutoReleaseGeometry geo(target, 16, 0); if (!geo.succeeded()) { |