fix bounds in unit test and minor opt in Dispatch

Author: flar

display_list/display_list.cc

@@ -70,10 +70,8 @@ class NopCuller : public Culler {
 NopCuller NopCuller::instance = NopCuller();
 class VectorCuller : public Culler {
  public:
-  VectorCuller(sk_sp<const DlRTree> rtree, const std::vector<int>& rect_indices)
-      : rtree_(std::move(rtree)),
-        cur_(rect_indices.begin()),
-        end_(rect_indices.end()) {}
+  VectorCuller(const DlRTree* rtree, const std::vector<int>& rect_indices)
+      : rtree_(rtree), cur_(rect_indices.begin()), end_(rect_indices.end()) {}
 
   bool init(DispatchContext& context) override {
     if (cur_ < end_) {
@@ -100,7 +98,7 @@ class VectorCuller : public Culler {
   }
 
  private:
-  const sk_sp<const DlRTree> rtree_;
+  const DlRTree* rtree_;
   std::vector<int>::const_iterator cur_;
   std::vector<int>::const_iterator end_;
 };
@@ -117,16 +115,17 @@ void DisplayList::Dispatch(Dispatcher& ctx, const SkRect& cull_rect) {
     Dispatch(ctx);
     return;
   }
-  FML_DCHECK(rtree() != nullptr);
-  if (rtree() == nullptr) {
+  const DlRTree* rtree = this->rtree().get();
+  FML_DCHECK(rtree != nullptr);
+  if (rtree == nullptr) {
     FML_LOG(ERROR) << "dispatched with culling rect on DL with no rtree";
     Dispatch(ctx);
     return;
   }
   uint8_t* ptr = storage_.get();
   std::vector<int> rect_indices;
-  rtree()->search(cull_rect, &rect_indices);
-  VectorCuller culler(rtree(), rect_indices);
+  rtree->search(cull_rect, &rect_indices);
+  VectorCuller culler(rtree, rect_indices);
   Dispatch(ctx, ptr, ptr + byte_count_, culler);
 }
 

display_list/display_list_unittests.cc

@@ -1231,13 +1231,8 @@ TEST(DisplayList, FlutterSvgIssue661BoundsWereEmpty) {
   // line has to be revised too often as the DL implementation is
   // improved and maintained, then we can eliminate this test and
   // just rely on the "rounded out" bounds test that follows.
-  FML_LOG(ERROR) << "dl bounds: " << std::setprecision(15)
-      << display_list->bounds().fLeft << ", "
-      << display_list->bounds().fTop << ", "
-      << display_list->bounds().fRight << ", "
-      << display_list->bounds().fBottom;
   EXPECT_EQ(display_list->bounds(),
-            SkRect::MakeLTRB(0, 0.00189208984375, 99.9839630127, 100));
+            SkRect::MakeLTRB(0, 0.00190162658691406, 99.9839553833008, 100));
   // This is the more practical result. The bounds are "almost" 0,0,100x100
   EXPECT_EQ(display_list->bounds().roundOut(), SkIRect::MakeWH(100, 100));
   EXPECT_EQ(display_list->op_count(), 19u);