Support general raster matrix for RasterSource and DisplayItemList

cc/playback/display_item_list.cc

 // Copyright 2014 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/playback/display_item_list.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 101 matching lines @@
 
   DCHECK_EQ(0, proto->items_size());
   for (const auto& item : items_)
     item.ToProtobuf(proto->add_items(), image_serialization_processor);
 }
 
 void DisplayItemList::Raster(SkCanvas* canvas,
                              SkPicture::AbortCallback* callback,
                              const gfx::Rect& canvas_target_playback_rect,
                              float contents_scale) const {
+  canvas->save();
+
+  if (!canvas_target_playback_rect.IsEmpty()) {
+    // canvas_target_playback_rect is specified in device space. We can't
+    // use clipRect because canvas CTM will be applied on it. Use clipRegion
+    // instead because it ignores canvas CTM.
+    SkRegion device_clip;
+    device_clip.setRect(gfx::RectToSkIRect(canvas_target_playback_rect));
+    canvas->clipRegion(device_clip);
+  }
+
+  canvas->scale(contents_scale, contents_scale);
+  Raster(canvas, callback);
+  canvas->restore();
+}
+
+void DisplayItemList::Raster(SkCanvas* canvas,
+                             SkPicture::AbortCallback* callback) const {
   if (!settings_.use_cached_picture) {
-    canvas->save();
-    canvas->scale(contents_scale, contents_scale);
     for (const auto& item : items_)
-      item.Raster(canvas, canvas_target_playback_rect, callback);
-    canvas->restore();
+      item.Raster(canvas, callback);
   } else {
     DCHECK(picture_);
 
     canvas->save();
-    canvas->scale(contents_scale, contents_scale);
     canvas->translate(layer_rect_.x(), layer_rect_.y());
     if (callback) {
       // If we have a callback, we need to call |draw()|, |drawPicture()|
       // doesn't take a callback.  This is used by |AnalysisCanvas| to early
       // out.
       picture_->playback(canvas, callback);
     } else {
       // Prefer to call |drawPicture()| on the canvas since it could place the
       // entire picture on the canvas instead of parsing the skia operations.
       canvas->drawPicture(picture_.get());
     }
     canvas->restore();
   }
 }
 
 void DisplayItemList::ProcessAppendedItem(const DisplayItem* item) {
   if (settings_.use_cached_picture) {
     DCHECK(recorder_);
-    item->Raster(recorder_->getRecordingCanvas(), gfx::Rect(), nullptr);
+    item->Raster(recorder_->getRecordingCanvas(), nullptr);
   }
   if (!retain_individual_display_items_) {
     items_.Clear();
   }
 }
 
 void DisplayItemList::RasterIntoCanvas(const DisplayItem& item) {
   DCHECK(recorder_);
   DCHECK(!retain_individual_display_items_);
 
-  item.Raster(recorder_->getRecordingCanvas(), gfx::Rect(), nullptr);
+  item.Raster(recorder_->getRecordingCanvas(), nullptr);
 }
 
 bool DisplayItemList::RetainsIndividualDisplayItems() const {
   return retain_individual_display_items_;
 }
 
 void DisplayItemList::Finalize() {
   TRACE_EVENT0("cc", "DisplayItemList::Finalize");
   // TODO(dtrainor): Need to deal with serializing visual_rects_.
   // http://crbug.com/568757.
@@ skipping 130 matching lines @@
 }
 
 void DisplayItemList::GetDiscardableImagesInRect(
     const gfx::Rect& rect,
     float raster_scale,
     std::vector<DrawImage>* images) {
   image_map_.GetDiscardableImagesInRect(rect, raster_scale, images);
 }
 
 }  // namespace cc