Don't duplicate SkRTree

Author: Emmanuel Garcia

BUILD.gn

@@ -79,7 +79,6 @@ group("flutter") {
       "//flutter/shell/platform/embedder:embedder_unittests",
       "//flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw_unittests",
       "//flutter/testing:testing_unittests",
-      "//flutter/third_party/skia:rtree_unittests",
       "//flutter/third_party/txt:txt_unittests",
     ]
 

ci/licenses.sh

@@ -55,7 +55,7 @@ fi
 
 echo "Checking license count in licenses_flutter..."
 actualLicenseCount=`tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9'`
-expectedLicenseCount=4 # When changing this number: Update the error message below as well describing all expected license types.
+expectedLicenseCount=2 # When changing this number: Update the error message below as well describing all expected license types.
 
 if [ "$actualLicenseCount" -ne "$expectedLicenseCount" ]
 then
@@ -67,8 +67,6 @@ then
     echo "header with the following copyright:"
     echo "    Copyright 2013 The Flutter Authors. All rights reserved."
     echo "Files in 'third_party/txt' may have an Apache license header instead."
-    echo "Files in 'third_party/skia' may have the following copyright:"
-    echo "    Copyright 2012 Google Inc."
     echo "If you're absolutely sure that the change in license count is"
     echo "intentional, update 'flutter/ci/licenses.sh' with the new count."
     echo "================================================================="

ci/licenses_golden/licenses_flutter

@@ -1,39 +1,6 @@
 UNUSED LICENSES:
 
-====================================================================================================
-ORIGIN: ../../../flutter/third_party/skia/LICENSE
-TYPE: LicenseType.bsd
-----------------------------------------------------------------------------------------------------
-Copyright (c) 2011 Google Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
 
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of the copyright holder nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 USED LICENSES:
 
@@ -125,6 +92,9 @@ FILE: ../../../flutter/flow/raster_cache.h
 FILE: ../../../flutter/flow/raster_cache_key.cc
 FILE: ../../../flutter/flow/raster_cache_key.h
 FILE: ../../../flutter/flow/raster_cache_unittests.cc
+FILE: ../../../flutter/flow/rtree.cc
+FILE: ../../../flutter/flow/rtree.h
+FILE: ../../../flutter/flow/rtree_unittests.cc
 FILE: ../../../flutter/flow/scene_update_context.cc
 FILE: ../../../flutter/flow/scene_update_context.h
 FILE: ../../../flutter/flow/skia_gpu_object.cc
@@ -1615,44 +1585,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ====================================================================================================
-
-====================================================================================================
-LIBRARY: skia
-ORIGIN: ../../../flutter/third_party/skia/main_unittests.cc + ../../../flutter/third_party/skia/LICENSE
-TYPE: LicenseType.bsd
-FILE: ../../../flutter/third_party/skia/main_unittests.cc
-FILE: ../../../flutter/third_party/skia/rtree.cc
-FILE: ../../../flutter/third_party/skia/rtree.h
-FILE: ../../../flutter/third_party/skia/rtree_unittests.cc
-----------------------------------------------------------------------------------------------------
-Copyright 2012 Google Inc.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of the copyright holder nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-====================================================================================================
-Total license count: 4
+Total license count: 2

flow/BUILD.gn

@@ -58,6 +58,8 @@ source_set("flow") {
     "raster_cache.h",
     "raster_cache_key.cc",
     "raster_cache_key.h",
+    "rtree.h",
+    "rtree.cc",
     "skia_gpu_object.cc",
     "skia_gpu_object.h",
     "texture.cc",
@@ -150,6 +152,7 @@ executable("flow_unittests") {
     "matrix_decomposition_unittests.cc",
     "mutators_stack_unittests.cc",
     "raster_cache_unittests.cc",
+    "rtree_unittests.cc",
     "skia_gpu_object_unittests.cc",
     "testing/mock_layer_unittests.cc",
     "testing/mock_texture_unittests.cc",

flow/rtree.cc

@@ -0,0 +1,100 @@
+// Copyright 2013 The Flutter 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 "rtree.h"
+
+#include <list>
+
+#include "flutter/fml/logging.h"
+#include "third_party/skia/include/core/SkBBHFactory.h"
+
+namespace flutter {
+
+RTree::RTree() : bbh_{SkRTreeFactory{}()}, all_ops_count_(0) {}
+
+void RTree::insert(const SkRect boundsArray[],
+                   const SkBBoxHierarchy::Metadata metadata[],
+                   int N) {
+  FML_DCHECK(0 == all_ops_count_);
+  bbh_->insert(boundsArray, metadata, N);
+  for (int i = 0; i < N; i++) {
+    if (metadata != nullptr && metadata[i].isDraw) {
+      draw_op_[i] = boundsArray[i];
+    }
+  }
+  all_ops_count_ = N;
+}
+
+void RTree::insert(const SkRect boundsArray[], int N) {
+  insert(boundsArray, nullptr, N);
+}
+
+void RTree::search(const SkRect& query, std::vector<int>* results) const {
+  bbh_->search(query, results);
+}
+
+std::list<SkRect> RTree::searchNonOverlappingDrawnRects(
+    const SkRect& query) const {
+  // Get the indexes for the operations that intersect with the query rect.
+  std::vector<int> intermediary_results;
+  search(query, &intermediary_results);
+
+  std::list<SkRect> final_results;
+  for (int index : intermediary_results) {
+    auto draw_op = draw_op_.find(index);
+    // Ignore records that don't draw anything.
+    if (draw_op == draw_op_.end()) {
+      continue;
+    }
+    auto current_record_rect = draw_op->second;
+    auto replaced_existing_rect = false;
+    // // If the current record rect intersects with any of the rects in the
+    // // result list, then join them, and update the rect in final_results.
+    std::list<SkRect>::iterator curr_rect_itr = final_results.begin();
+    std::list<SkRect>::iterator first_intersecting_rect_itr;
+    while (!replaced_existing_rect && curr_rect_itr != final_results.end()) {
+      if (SkRect::Intersects(*curr_rect_itr, current_record_rect)) {
+        replaced_existing_rect = true;
+        first_intersecting_rect_itr = curr_rect_itr;
+        curr_rect_itr->join(current_record_rect);
+      }
+      curr_rect_itr++;
+    }
+    // It's possible that the result contains duplicated rects at this point.
+    // For example, consider a result list that contains rects A, B. If a
+    // new rect C is a superset of A and B, then A and B are the same set after
+    // the merge. As a result, find such cases and remove them from the result
+    // list.
+    while (replaced_existing_rect && curr_rect_itr != final_results.end()) {
+      if (SkRect::Intersects(*curr_rect_itr, *first_intersecting_rect_itr)) {
+        first_intersecting_rect_itr->join(*curr_rect_itr);
+        curr_rect_itr = final_results.erase(curr_rect_itr);
+      } else {
+        curr_rect_itr++;
+      }
+    }
+    if (!replaced_existing_rect) {
+      final_results.push_back(current_record_rect);
+    }
+  }
+  return final_results;
+}
+
+size_t RTree::bytesUsed() const {
+  return bbh_->bytesUsed();
+}
+
+RTreeFactory::RTreeFactory() {
+  r_tree_ = sk_make_sp<RTree>();
+}
+
+sk_sp<RTree> RTreeFactory::getInstance() {
+  return r_tree_;
+}
+
+sk_sp<SkBBoxHierarchy> RTreeFactory::operator()() const {
+  return r_tree_;
+}
+
+}  // namespace flutter

flow/rtree.h

@@ -0,0 +1,65 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FLUTTER_FLOW_RTREE_H_
+#define FLUTTER_FLOW_RTREE_H_
+
+#include <list>
+#include <map>
+
+#include "third_party/skia/include/core/SkBBHFactory.h"
+#include "third_party/skia/include/core/SkTypes.h"
+
+namespace flutter {
+/**
+ * An R-Tree implementation that forwards calls to an SkRTree.
+ *
+ * This implementation provides a searchNonOverlappingDrawnRects method,
+ * which can be used to query the rects for the operations recorded in the tree.
+ */
+class RTree : public SkBBoxHierarchy {
+ public:
+  RTree();
+
+  void insert(const SkRect[],
+              const SkBBoxHierarchy::Metadata[],
+              int N) override;
+  void insert(const SkRect[], int N) override;
+  void search(const SkRect& query, std::vector<int>* results) const override;
+  size_t bytesUsed() const override;
+
+  // Finds the rects in the tree that represent drawing operations and intersect
+  // with the query rect.
+  //
+  // When two rects intersect with each other, they are joined into a single
+  // rect which also intersects with the query rect. In other words, the bounds
+  // of each rect in the result list are mutually exclusive.
+  std::list<SkRect> searchNonOverlappingDrawnRects(const SkRect& query) const;
+
+  // Insertion count (not overall node count, which may be greater).
+  int getCount() const { return all_ops_count_; }
+
+ private:
+  // A map containing the draw operation rects keyed off the operation index
+  // in the insert call.
+  std::map<int, SkRect> draw_op_;
+  sk_sp<SkBBoxHierarchy> bbh_;
+  int all_ops_count_;
+};
+
+class RTreeFactory : public SkBBHFactory {
+ public:
+  RTreeFactory();
+
+  // Gets the instance to the R-tree.
+  sk_sp<RTree> getInstance();
+  sk_sp<SkBBoxHierarchy> operator()() const override;
+
+ private:
+  sk_sp<RTree> r_tree_;
+};
+
+#endif  // FLUTTER_FLOW_RTREE_H_
+
+}  // namespace flutter