Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Unified Diff: cc/output/software_renderer.cc

Issue 394193003: Implement HiDPI and pinch-zoom scaling of filter params (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add unittests Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/output/software_renderer.cc
diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc
index 0a04f098771111c7dcf8ee75142cb07cd2200b1f..19dc175c71d0c69f73dc6419491e8bde582b299f 100644
--- a/cc/output/software_renderer.cc
+++ b/cc/output/software_renderer.cc
@@ -526,9 +526,6 @@ void SoftwareRenderer::DrawRenderPassQuad(const DrawingFrame* frame,
if (!quad->filters.IsEmpty()) {
skia::RefPtr<SkImageFilter> filter = RenderSurfaceFilters::BuildImageFilter(
quad->filters, content_texture->size());
- // TODO(ajuma): In addition origin translation, the canvas should also be
- // scaled to accomodate device pixel ratio and pinch zoom. See
- // crbug.com/281516 and crbug.com/281518.
// TODO(ajuma): Apply the filter in the same pass as the content where
// possible (e.g. when there's no origin offset). See crbug.com/308201.
if (filter) {
@@ -541,6 +538,7 @@ void SoftwareRenderer::DrawRenderPassQuad(const DrawingFrame* frame,
canvas.clear(SK_ColorTRANSPARENT);
canvas.translate(SkIntToScalar(-quad->rect.origin().x()),
SkIntToScalar(-quad->rect.origin().y()));
+ canvas.scale(quad->filters_scale.x(), quad->filters_scale.y());
canvas.drawSprite(*content, 0, 0, &paint);
}
}

Powered by Google App Engine
This is Rietveld 408576698