Use DlRegion from R-Tree in raster cache

Author: knopp

flow/raster_cache.cc

@@ -53,16 +53,17 @@ void RasterCacheResult::draw(DlCanvas& canvas,
     // On some platforms RTree from overlay layers is used for unobstructed
     // platform views and hit testing. To preserve the RTree raster cache must
     // paint individual rects instead of the whole image.
-    auto rects = rtree_->searchAndConsolidateRects(kGiantRect);
+    auto rects = rtree_->region().getRects(true);
 
     canvas.Translate(bounds.fLeft, bounds.fTop);
 
     SkRect rtree_bounds =
         RasterCacheUtil::GetRoundedOutDeviceBounds(rtree_->bounds(), matrix);
     for (auto rect : rects) {
-      rect = RasterCacheUtil::GetRoundedOutDeviceBounds(rect, matrix);
-      rect.offset(-rtree_bounds.fLeft, -rtree_bounds.fTop);
-      canvas.DrawImageRect(image_, rect, rect,
+      SkRect device_rect = RasterCacheUtil::GetRoundedOutDeviceBounds(
+          SkRect::Make(rect), matrix);
+      device_rect.offset(-rtree_bounds.fLeft, -rtree_bounds.fTop);
+      canvas.DrawImageRect(image_, device_rect, device_rect,
                            DlImageSampling::kNearestNeighbor, paint);
     }
   }