diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-08-26 14:40:38 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-08-26 14:40:38 +0000 |
| commit | 17b78946096265d80215a6c946286ecaa35ea7ed (patch) | |
| tree | 3af45529670451a9df0bd13ca71fa6a4a98d0eae /src/core/SkCanvas.cpp | |
| parent | 5f226572b3b6e1a6fea11f5f3c862a47158f66fe (diff) | |
rolling back the experimental rollbacks in r2178-2179
git-svn-id: http://skia.googlecode.com/svn/trunk@2180 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkCanvas.cpp')
| -rw-r--r-- | src/core/SkCanvas.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 65f34ccce8..3bb193bd13 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -528,7 +528,6 @@ SkDevice* SkCanvas::setDevice(SkDevice* device) { while ((rec = (MCRec*)iter.next()) != NULL) { (void)rec->fRegion->op(bounds, SkRegion::kIntersect_Op); } - fClipStack.clipDevRect(bounds, SkRegion::kIntersect_Op); } return device; } @@ -1384,11 +1383,11 @@ private: void SkCanvas::DrawRect(const SkDraw& draw, const SkPaint& paint, const SkRect& r, SkScalar textSize) { - if (paint.getStyle() == SkPaint::kFill_Style) {
+ if (paint.getStyle() == SkPaint::kFill_Style) { draw.fDevice->drawRect(draw, r, paint); } else { SkPaint p(paint); - p.setStrokeWidth(SkScalarMul(textSize, paint.getStrokeWidth()));
+ p.setStrokeWidth(SkScalarMul(textSize, paint.getStrokeWidth())); draw.fDevice->drawRect(draw, r, p); } } |