Add unittests, some API name changes to confirm with coding style gui…

…delines, fix minor bug in GL calculator's drawLine

display_list/BUILD.gn

@@ -44,6 +44,9 @@ source_set("unittests") {
 
   sources = [
     "display_list_canvas_unittests.cc",
+    "display_list_complexity_unittests.cc",
+    "display_list_test_utils.cc",
+    "display_list_test_utils.h",
     "display_list_unittests.cc",
   ]
 

display_list/display_list_complexity.h

@@ -24,6 +24,13 @@ class DisplayListComplexityCalculator {
   // Returns whether a given complexity score meets the threshold for
   // cacheability for this particular ComplexityCalculator
   virtual bool ShouldBeCached(unsigned int complexity_score) = 0;
+
+  // Sets a ceiling for the complexity score being calculated. By default
+  // this is the largest number representable by an unsigned int.
+  //
+  // This setting has no effect on non-accumulator based scorers such as
+  // the Naive calculator.
+  virtual void SetComplexityCeiling(unsigned int ceiling) = 0;
 };
 
 class DisplayListNaiveComplexityCalculator
@@ -39,6 +46,8 @@ class DisplayListNaiveComplexityCalculator
     return complexity_score > 5u;
   }
 
+  void SetComplexityCeiling(unsigned int ceiling) override {}
+
  private:
   DisplayListNaiveComplexityCalculator() {}
   static DisplayListNaiveComplexityCalculator* instance_;

display_list/display_list_complexity_gl.cc

@@ -17,7 +17,7 @@ namespace flutter {
 DisplayListGLComplexityCalculator*
     DisplayListGLComplexityCalculator::instance_ = nullptr;
 
-DisplayListComplexityCalculator*
+DisplayListGLComplexityCalculator*
 DisplayListGLComplexityCalculator::GetInstance() {
   if (instance_ == nullptr) {
     instance_ = new DisplayListGLComplexityCalculator();
@@ -70,7 +70,8 @@ void DisplayListGLComplexityCalculator::GLHelper::drawLine(const SkPoint& p0,
   // The baseline complexity is for a hairline stroke with no AA
   // m = 1/40
   // c = 13
-  unsigned int complexity = (distance + 520) / 2;
+  unsigned int complexity =
+      ((distance + 520) / 2) * non_hairline_penalty * aa_penalty;
 
   AccumulateComplexity(complexity);
 }

display_list/display_list_complexity_gl.h

@@ -12,7 +12,7 @@ namespace flutter {
 class DisplayListGLComplexityCalculator
     : public DisplayListComplexityCalculator {
  public:
-  static DisplayListComplexityCalculator* GetInstance();
+  static DisplayListGLComplexityCalculator* GetInstance();
 
   unsigned int Compute(DisplayList* display_list) override {
     GLHelper helper(ceiling_);
@@ -25,7 +25,9 @@ class DisplayListGLComplexityCalculator
     return complexity_score > 200000u;
   }
 
-  void SetComplexityCeiling(unsigned int ceiling) { ceiling_ = ceiling; }
+  void SetComplexityCeiling(unsigned int ceiling) override {
+    ceiling_ = ceiling;
+  }
 
  private:
   class GLHelper : public ComplexityCalculatorHelper {

display_list/display_list_complexity_metal.cc

@@ -17,7 +17,7 @@ namespace flutter {
 DisplayListMetalComplexityCalculator*
     DisplayListMetalComplexityCalculator::instance_ = nullptr;
 
-DisplayListComplexityCalculator*
+DisplayListMetalComplexityCalculator*
 DisplayListMetalComplexityCalculator::GetInstance() {
   if (instance_ == nullptr) {
     instance_ = new DisplayListMetalComplexityCalculator();

display_list/display_list_complexity_metal.h

@@ -12,7 +12,7 @@ namespace flutter {
 class DisplayListMetalComplexityCalculator
     : public DisplayListComplexityCalculator {
  public:
-  static DisplayListComplexityCalculator* GetInstance();
+  static DisplayListMetalComplexityCalculator* GetInstance();
 
   unsigned int Compute(DisplayList* display_list) override {
     MetalHelper helper(ceiling_);
@@ -25,7 +25,9 @@ class DisplayListMetalComplexityCalculator
     return complexity_score > 200000u;
   }
 
-  void SetComplexityCeiling(unsigned int ceiling) { ceiling_ = ceiling; }
+  void SetComplexityCeiling(unsigned int ceiling) override {
+    ceiling_ = ceiling;
+  }
 
  private:
   class MetalHelper : public ComplexityCalculatorHelper {