Request quickReject results from correct drawing canvas (flutter#22674)

flar · web-flow · commit 8f4901f1d620 · 2020-11-24T13:11:15.000-08:00
Also Fix MockCanvas clipping so tests will work with new culling
diff --git a/flow/layers/layer.h b/flow/layers/layer.h
@@ -195,7 +195,7 @@ class Layer {
     if (paint_bounds_.isEmpty()) {
       return false;
     }
-    return !context.internal_nodes_canvas->quickReject(paint_bounds_);
+    return !context.leaf_nodes_canvas->quickReject(paint_bounds_);
   }
 
   uint64_t unique_id() const { return unique_id_; }
diff --git a/flow/raster_cache.cc b/flow/raster_cache.cc
@@ -158,6 +158,7 @@ std::unique_ptr<RasterCacheResult> RasterCache::RasterizeLayer(
         SkISize canvas_size = canvas->getBaseLayerSize();
         SkNWayCanvas internal_nodes_canvas(canvas_size.width(),
                                            canvas_size.height());
+        internal_nodes_canvas.setMatrix(canvas->getTotalMatrix());
         internal_nodes_canvas.addCanvas(canvas);
         Layer::PaintContext paintContext = {
             /* internal_nodes_canvas= */ static_cast<SkCanvas*>(
diff --git a/testing/mock_canvas.cc b/testing/mock_canvas.cc
@@ -148,20 +148,26 @@ void MockCanvas::onClipRect(const SkRect& rect,
                             ClipEdgeStyle style) {
   draw_calls_.emplace_back(
       DrawCall{current_layer_, ClipRectData{rect, op, style}});
+  // quickReject() is handled by base class and needs accurate clip information
+  SkCanvas::onClipRect(rect, op, style);
 }
 
 void MockCanvas::onClipRRect(const SkRRect& rrect,
                              SkClipOp op,
                              ClipEdgeStyle style) {
   draw_calls_.emplace_back(
       DrawCall{current_layer_, ClipRRectData{rrect, op, style}});
+  // quickReject() is handled by base class and needs accurate clip information
+  SkCanvas::onClipRRect(rrect, op, style);
 }
 
 void MockCanvas::onClipPath(const SkPath& path,
                             SkClipOp op,
                             ClipEdgeStyle style) {
   draw_calls_.emplace_back(
       DrawCall{current_layer_, ClipPathData{path, op, style}});
+  // quickReject() is handled by base class and needs accurate clip information
+  SkCanvas::onClipPath(path, op, style);
 }
 
 bool MockCanvas::onDoSaveBehind(const SkRect*) {

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ class Layer {`
`195`	`195`	`if (paint_bounds_.isEmpty()) {`
`196`	`196`	`return false;`
`197`	`197`	`}`
`198`		`- return !context.internal_nodes_canvas->quickReject(paint_bounds_);`
	`198`	`+ return !context.leaf_nodes_canvas->quickReject(paint_bounds_);`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`uint64_t unique_id() const { return unique_id_; }`