Implement HiDPI and pinch-zoom scaling of filter params

cc/output/software_renderer.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/output/software_renderer.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/base/math_util.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
@@ skipping 508 matching lines @@
   SkMatrix content_mat;
   content_mat.setRectToRect(content_rect, dest_rect,
                             SkMatrix::kFill_ScaleToFit);
 
   const SkBitmap* content = lock.sk_bitmap();
 
   SkBitmap filter_bitmap;
   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) {
       SkImageInfo info = SkImageInfo::MakeN32Premul(
           content_texture->size().width(), content_texture->size().height());
       if (filter_bitmap.allocPixels(info)) {
         SkCanvas canvas(filter_bitmap);
         SkPaint paint;
         paint.setImageFilter(filter.get());
         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);
       }
     }
   }
 
   skia::RefPtr<SkShader> shader;
   if (filter_bitmap.isNull()) {
     shader = skia::AdoptRef(SkShader::CreateBitmapShader(
         *content, content_tile_mode, content_tile_mode, &content_mat));
   } else {
@@ skipping 92 matching lines @@
 }
 
 void SoftwareRenderer::DidChangeVisibility() {
   if (visible())
     EnsureBackbuffer();
   else
     DiscardBackbuffer();
 }
 
 }  // namespace cc