draft for SkColorFilter to DlColorFilter

Author: JsouLiang

display_list/display_list_builder.cc

@@ -3,11 +3,8 @@
 // found in the LICENSE file.
 
 #include "flutter/display_list/display_list_builder.h"
-#include <cstddef>
 
-#include "flutter/display_list/display_list.h"
 #include "flutter/display_list/display_list_blend_mode.h"
-#include "flutter/display_list/display_list_color.h"
 #include "flutter/display_list/display_list_ops.h"
 
 namespace flutter {
@@ -492,7 +489,6 @@ void DisplayListBuilder::saveLayer(const SkRect* bounds,
     }
   }
 }
-
 void DisplayListBuilder::saveLayer(const SkRect* bounds,
                                    const DlPaint* paint,
                                    const DlImageFilter* backdrop) {

display_list/display_list_builder.h

@@ -7,7 +7,6 @@
 
 #include "flutter/display_list/display_list.h"
 #include "flutter/display_list/display_list_blend_mode.h"
-#include "flutter/display_list/display_list_color_filter.h"
 #include "flutter/display_list/display_list_comparable.h"
 #include "flutter/display_list/display_list_dispatcher.h"
 #include "flutter/display_list/display_list_flags.h"
@@ -170,7 +169,6 @@ class DisplayListBuilder final : public virtual Dispatcher,
   void saveLayer(const SkRect* bounds,
                  const DlPaint* paint,
                  const DlImageFilter* backdrop = nullptr);
-
   void restore() override;
   int getSaveCount() { return layer_stack_.size(); }
   void restoreToCount(int restore_count);

display_list/display_list_canvas_dispatcher.cc

@@ -6,7 +6,6 @@
 
 #include "flutter/display_list/display_list_blend_mode.h"
 #include "flutter/fml/trace_event.h"
-#include "include/core/SkColorFilter.h"
 
 namespace flutter {
 

display_list/display_list_dispatcher.h

@@ -75,7 +75,6 @@ class Dispatcher {
   virtual void saveLayer(const SkRect* bounds,
                          const SaveLayerOptions options,
                          const DlImageFilter* backdrop = nullptr) = 0;
-
   virtual void restore() = 0;
 
   virtual void translate(SkScalar tx, SkScalar ty) = 0;

display_list/display_list_utils.cc

@@ -345,7 +345,6 @@ void DisplayListBoundsCalculator::saveLayer(const SkRect* bounds,
     AccumulateUnbounded();
   }
 }
-
 void DisplayListBoundsCalculator::restore() {
   if (layer_infos_.size() > 1) {
     SkMatrixDispatchHelper::restore();

display_list/display_list_utils.h

@@ -508,10 +508,11 @@ class DisplayListBoundsCalculator final
   // during restore.
   class LayerData {
    public:
-    // Construct a LayerData to DisplayListBoundsCalculatorpush on the save
-    // stack for a |save| or |saveLayer| call. The |outer| parameter is the
-    // |BoundsAccumulator| that was in use by the stream before this layer was
-    // pushed on the stack and should be returned when this layer is popped off
+    // Construct a LayerData to push on the save stack for a |save|
+    // or |saveLayer| call.
+    // The |outer| parameter is the |BoundsAccumulator| that was
+    // in use by the stream before this layer was pushed on the
+    // stack and should be returned when this layer is popped off
     // the stack.
     // Some saveLayer calls will process their bounds by a
     // |DlImageFilter| when they are restored, but for most

flow/layers/image_filter_layer.cc

@@ -3,19 +3,16 @@
 // found in the LICENSE file.
 
 #include "flutter/flow/layers/image_filter_layer.h"
-
-#include "flutter/display_list/display_list_image_filter.h"
 #include "flutter/flow/layers/layer.h"
 #include "flutter/flow/raster_cache_util.h"
 
 namespace flutter {
 
-ImageFilterLayer::ImageFilterLayer(std::shared_ptr<const DlImageFilter> filter)
+ImageFilterLayer::ImageFilterLayer(sk_sp<SkImageFilter> filter)
     : CacheableContainerLayer(
           RasterCacheUtil::kMinimumRendersBeforeCachingFilterLayer),
-      sk_filter_(filter != nullptr ? filter->skia_object() : nullptr),
-      transformed_filter_(nullptr),
-      filter_(std::move(filter)) {}
+      filter_(std::move(filter)),
+      transformed_filter_(nullptr) {}
 
 void ImageFilterLayer::Diff(DiffContext* context, const Layer* old_layer) {
   DiffContext::AutoSubtreeRestore subtree(context);
@@ -28,7 +25,7 @@ void ImageFilterLayer::Diff(DiffContext* context, const Layer* old_layer) {
   }
 
   if (filter_) {
-    auto filter = sk_filter_->makeWithLocalMatrix(context->GetTransform());
+    auto filter = filter_->makeWithLocalMatrix(context->GetTransform());
     if (filter) {
       // This transform will be applied to every child rect in the subtree
       context->PushFilterBoundsAdjustment([filter](SkRect rect) {
@@ -65,7 +62,7 @@ void ImageFilterLayer::Preroll(PrerollContext* context,
   }
 
   const SkIRect filter_input_bounds = child_bounds.roundOut();
-  SkIRect filter_output_bounds = sk_filter_->filterBounds(
+  SkIRect filter_output_bounds = filter_->filterBounds(
       filter_input_bounds, SkMatrix::I(), SkImageFilter::kForward_MapDirection);
   child_bounds = SkRect::Make(filter_output_bounds);
 
@@ -75,7 +72,7 @@ void ImageFilterLayer::Preroll(PrerollContext* context,
   // So in here we reset the LayerRasterCacheItem cache state.
   layer_raster_cache_item_->MarkNotCacheChildren();
 
-  transformed_filter_ = sk_filter_->makeWithLocalMatrix(matrix);
+  transformed_filter_ = filter_->makeWithLocalMatrix(matrix);
   if (transformed_filter_) {
     layer_raster_cache_item_->MarkCacheChildren();
   }
@@ -94,7 +91,7 @@ void ImageFilterLayer::Paint(PaintContext& context) const {
     return;
   }
 
-  cache_paint.setImageFilter(sk_filter_);
+  cache_paint.setImageFilter(filter_);
 
   // Normally a save_layer is sized to the current layer bounds, but in this
   // case the bounds of the child may not be the same as the filtered version

flow/layers/image_filter_layer.h

@@ -13,20 +13,18 @@ namespace flutter {
 
 class ImageFilterLayer : public CacheableContainerLayer {
  public:
-  explicit ImageFilterLayer(std::shared_ptr<const DlImageFilter> filter);
+  explicit ImageFilterLayer(sk_sp<SkImageFilter> filter);
 
   void Diff(DiffContext* context, const Layer* old_layer) override;
 
   void Preroll(PrerollContext* context, const SkMatrix& matrix) override;
 
   void Paint(PaintContext& context) const override;
 
-  sk_sp<SkImageFilter> sk_filter() const { return sk_filter_; }
-
  private:
-  sk_sp<SkImageFilter> sk_filter_;
+  sk_sp<SkImageFilter> filter_;
   sk_sp<SkImageFilter> transformed_filter_;
-  std::shared_ptr<const DlImageFilter> filter_;
+
   FML_DISALLOW_COPY_AND_ASSIGN(ImageFilterLayer);
 };