summaryrefslogtreecommitdiffstats
path: root/cc/picture.cc
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-08 17:12:33 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-08 17:12:33 +0000
commitce37a153aa8edcda878ca8dde0a61f43e514c88f (patch)
tree2cea5a5f3ac23539ed74147e001f56ad9431d8ff /cc/picture.cc
parentfb6df6d7cb47fcf34dfc4e72b130d3c0fe5a2ba5 (diff)
downloadchromium_src-ce37a153aa8edcda878ca8dde0a61f43e514c88f.zip
chromium_src-ce37a153aa8edcda878ca8dde0a61f43e514c88f.tar.gz
chromium_src-ce37a153aa8edcda878ca8dde0a61f43e514c88f.tar.bz2
cc: Fix low-res impl-side painting artifacts
Instead of clipping cc::Picture on recorded pixel boundaries (which may be a partial pixel in the final rastered content if content scale < 1), clip only on integral pixels in the final rastered output. This requires recording a small buffer of pixels around every picture, specified via a min contents scale. NOTRY=true R=nduca@chromium.org BUG=167590 Review URL: https://chromiumcodereview.appspot.com/11678003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175542 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/picture.cc')
-rw-r--r--cc/picture.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/cc/picture.cc b/cc/picture.cc
index 378c20e..b0e36e8 100644
--- a/cc/picture.cc
+++ b/cc/picture.cc
@@ -10,6 +10,7 @@
#include "third_party/skia/include/core/SkData.h"
#include "third_party/skia/include/utils/SkPictureUtils.h"
#include "ui/gfx/rect_conversions.h"
+#include "ui/gfx/skia_util.h"
namespace {
// URI label for a lazily decoded SkPixelRef.
@@ -88,10 +89,16 @@ void Picture::Record(ContentLayerClient* painter,
opaque_rect_ = gfx::ToEnclosedRect(opaque_layer_rect);
}
-void Picture::Raster(SkCanvas* canvas) {
+void Picture::Raster(
+ SkCanvas* canvas,
+ gfx::Rect content_rect,
+ float contents_scale) {
TRACE_EVENT0("cc", "Picture::Raster");
DCHECK(picture_);
+
canvas->save();
+ canvas->clipRect(gfx::RectToSkRect(content_rect));
+ canvas->scale(contents_scale, contents_scale);
canvas->translate(layer_rect_.x(), layer_rect_.y());
canvas->drawPicture(*picture_);
canvas->restore();