[DisplayList] remove obsolete use of Skia goemetry objects in DL utils (flutter#161553)

Accomplishes the `AccumulationRect and MatrixClipTracker` task in
flutter#161456

Remove legacy Skia geometry APIs from the DisplayList utils classes
(accumulation rect and matrix/clip state tracker) as well as the small
number of remaining uses of them (mostly from their own unit tests).

Author: flar

engine/src/flutter/display_list/dl_builder.cc

@@ -819,8 +819,8 @@ void DisplayListBuilder::Rotate(DlScalar degrees) {
   if (SkScalarMod(degrees, 360.0) != 0.0) {
     checkForDeferredSave();
     Push<RotateOp>(0, degrees);
-    global_state().rotate(degrees);
-    layer_local_state().rotate(degrees);
+    global_state().rotate(DlDegrees(degrees));
+    layer_local_state().rotate(DlDegrees(degrees));
   }
 }
 void DisplayListBuilder::Skew(DlScalar sx, DlScalar sy) {
@@ -914,7 +914,7 @@ void DisplayListBuilder::TransformReset() {
     // became singular while we were accumulating the current layer.
     // In either case, we should no longer be accumulating any
     // contents so we set the layer tracking transform to a singular one.
-    layer_local_state().setTransform(SkMatrix::Scale(0.0f, 0.0f));
+    layer_local_state().setTransform(DlMatrix::MakeScale({0.0f, 0.0f, 0.0f}));
   }
 
   global_state().setIdentity();
@@ -1050,8 +1050,8 @@ void DisplayListBuilder::ClipPath(const DlPath& path,
       return;
     }
   }
-  global_state().clipPath(path.GetSkPath(), clip_op, is_aa);
-  layer_local_state().clipPath(path.GetSkPath(), clip_op, is_aa);
+  global_state().clipPath(path, clip_op, is_aa);
+  layer_local_state().clipPath(path, clip_op, is_aa);
   if (global_state().is_cull_rect_empty() ||
       layer_local_state().is_cull_rect_empty()) {
     current_info().is_nop = true;
@@ -1488,7 +1488,7 @@ void DisplayListBuilder::drawAtlas(const sk_sp<DlImage> atlas,
     const DlRect& src = tex[i];
     xform[i].toQuad(src.GetWidth(), src.GetHeight(), quad);
     for (int j = 0; j < 4; j++) {
-      accumulator.accumulate(quad[j]);
+      accumulator.accumulate(ToDlPoint(quad[j]));
     }
   }
   if (accumulator.is_empty() ||

engine/src/flutter/display_list/utils/dl_accumulation_rect.cc

@@ -6,7 +6,7 @@
 
 namespace flutter {
 
-void AccumulationRect::accumulate(SkScalar x, SkScalar y) {
+void AccumulationRect::accumulate(DlScalar x, DlScalar y) {
   if (!std::isfinite(x) || !std::isfinite(y)) {
     return;
   }
@@ -28,25 +28,25 @@ void AccumulationRect::accumulate(SkScalar x, SkScalar y) {
   }
 }
 
-void AccumulationRect::accumulate(SkRect r) {
-  if (r.isEmpty()) {
+void AccumulationRect::accumulate(DlRect r) {
+  if (r.IsEmpty()) {
     return;
   }
-  if (r.fLeft < max_x_ && r.fRight > min_x_ &&  //
-      r.fTop < max_y_ && r.fBottom > min_y_) {
+  if (r.GetLeft() < max_x_ && r.GetRight() > min_x_ &&  //
+      r.GetTop() < max_y_ && r.GetBottom() > min_y_) {
     record_overlapping_bounds();
   }
-  if (min_x_ > r.fLeft) {
-    min_x_ = r.fLeft;
+  if (min_x_ > r.GetLeft()) {
+    min_x_ = r.GetLeft();
   }
-  if (min_y_ > r.fTop) {
-    min_y_ = r.fTop;
+  if (min_y_ > r.GetTop()) {
+    min_y_ = r.GetTop();
   }
-  if (max_x_ < r.fRight) {
-    max_x_ = r.fRight;
+  if (max_x_ < r.GetRight()) {
+    max_x_ = r.GetRight();
   }
-  if (max_y_ < r.fBottom) {
-    max_y_ = r.fBottom;
+  if (max_y_ < r.GetBottom()) {
+    max_y_ = r.GetBottom();
   }
 }
 
@@ -78,17 +78,11 @@ DlRect AccumulationRect::GetBounds() const {
              : DlRect();
 }
 
-SkRect AccumulationRect::bounds() const {
-  return (max_x_ >= min_x_ && max_y_ >= min_y_)
-             ? SkRect::MakeLTRB(min_x_, min_y_, max_x_, max_y_)
-             : SkRect::MakeEmpty();
-}
-
 void AccumulationRect::reset() {
-  min_x_ = std::numeric_limits<SkScalar>::infinity();
-  min_y_ = std::numeric_limits<SkScalar>::infinity();
-  max_x_ = -std::numeric_limits<SkScalar>::infinity();
-  max_y_ = -std::numeric_limits<SkScalar>::infinity();
+  min_x_ = std::numeric_limits<DlScalar>::infinity();
+  min_y_ = std::numeric_limits<DlScalar>::infinity();
+  max_x_ = -std::numeric_limits<DlScalar>::infinity();
+  max_y_ = -std::numeric_limits<DlScalar>::infinity();
   overlap_detected_ = false;
 }
 

engine/src/flutter/display_list/utils/dl_accumulation_rect.h

@@ -5,11 +5,7 @@
 #ifndef FLUTTER_DISPLAY_LIST_UTILS_DL_ACCUMULATION_RECT_H_
 #define FLUTTER_DISPLAY_LIST_UTILS_DL_ACCUMULATION_RECT_H_
 
-#include <functional>
-
 #include "flutter/display_list/geometry/dl_geometry_types.h"
-#include "flutter/display_list/geometry/dl_rtree.h"
-#include "flutter/fml/logging.h"
 
 namespace flutter {
 
@@ -26,18 +22,15 @@ class AccumulationRect {
  public:
   AccumulationRect() { reset(); }
 
-  void accumulate(SkScalar x, SkScalar y);
-  void accumulate(SkPoint p) { accumulate(p.fX, p.fY); }
+  void accumulate(DlScalar x, DlScalar y);
   void accumulate(DlPoint p) { accumulate(p.x, p.y); }
-  void accumulate(SkRect r);
-  void accumulate(DlRect r) { accumulate(ToSkRect(r)); }
+  void accumulate(DlRect r);
   void accumulate(AccumulationRect& ar);
 
   bool is_empty() const { return min_x_ >= max_x_ || min_y_ >= max_y_; }
   bool is_not_empty() const { return min_x_ < max_x_ && min_y_ < max_y_; }
 
   DlRect GetBounds() const;
-  SkRect bounds() const;
 
   void reset();