fix conflict

Author: JsouLiang

display_list/display_list_builder.cc

@@ -277,11 +277,11 @@ void DisplayListBuilder::onSetColorFilter(const DlColorFilter* filter) {
 }
 void DisplayListBuilder::onSetPathEffect(const DlPathEffect* effect) {
   if (effect == nullptr) {
-    current_path_effect_ = nullptr;
+    current_.setPathEffect(nullptr);
     Push<ClearPathEffectOp>(0, 0);
   } else {
-    current_path_effect_ = effect->shared();
-    switch (current_path_effect_->type()) {
+    current_.setPathEffect(effect->shared());
+    switch (effect->type()) {
       case DlPathEffectType::kDash: {
         const DlDashPathEffect* dash_effect = effect->asDash();
         void* pod = Push<SetPodPathEffectOp>(dash_effect->size(), 0);

display_list/display_list_builder.h

@@ -12,6 +12,7 @@
 #include "flutter/display_list/display_list_flags.h"
 #include "flutter/display_list/display_list_image.h"
 #include "flutter/display_list/display_list_paint.h"
+#include "flutter/display_list/display_list_path_effect.h"
 #include "flutter/display_list/types.h"
 #include "flutter/fml/macros.h"
 
@@ -103,7 +104,7 @@ class DisplayListBuilder final : public virtual Dispatcher,
     }
   }
   void setPathEffect(const DlPathEffect* effect) override {
-    if (NotEquals(current_path_effect_, effect)) {
+    if (NotEquals(current_.getPathEffect(), effect)) {
       onSetPathEffect(effect);
     }
   }
@@ -140,7 +141,7 @@ class DisplayListBuilder final : public virtual Dispatcher,
                             : SkBlender::Mode(ToSk(current_.getBlendMode()));
   }
   std::shared_ptr<const DlPathEffect> getPathEffect() const {
-    return current_path_effect_;
+    return current_.getPathEffect();
   }
   std::shared_ptr<const DlMaskFilter> getMaskFilter() const {
     return current_.getMaskFilter();
@@ -462,7 +463,6 @@ class DisplayListBuilder final : public virtual Dispatcher,
   DlPaint current_;
   // If |current_blender_| is set then ignore |current_.getBlendMode()|
   sk_sp<SkBlender> current_blender_;
-  sk_sp<SkPathEffect> current_path_effect_;
 };
 
 }  // namespace flutter

display_list/display_list_dispatcher.h

@@ -12,6 +12,7 @@
 #include "flutter/display_list/display_list_image.h"
 #include "flutter/display_list/display_list_image_filter.h"
 #include "flutter/display_list/display_list_mask_filter.h"
+#include "flutter/display_list/display_list_paint.h"
 #include "flutter/display_list/display_list_path_effect.h"
 #include "flutter/display_list/display_list_vertices.h"
 

display_list/display_list_paint.h

@@ -5,12 +5,14 @@
 #ifndef FLUTTER_DISPLAY_LIST_DISPLAY_LIST_PAINT_H_
 #define FLUTTER_DISPLAY_LIST_DISPLAY_LIST_PAINT_H_
 
+#include <memory>
 #include "flutter/display_list/display_list_blend_mode.h"
 #include "flutter/display_list/display_list_color.h"
 #include "flutter/display_list/display_list_color_filter.h"
 #include "flutter/display_list/display_list_color_source.h"
 #include "flutter/display_list/display_list_image_filter.h"
 #include "flutter/display_list/display_list_mask_filter.h"
+#include "flutter/display_list/display_list_path_effect.h"
 
 namespace flutter {
 
@@ -199,6 +201,15 @@ class DlPaint {
     return *this;
   }
 
+  std::shared_ptr<const DlPathEffect> getPathEffect() const {
+    return pathEffect_;
+  }
+  const DlPathEffect* getPathEffectPtr() const { return pathEffect_.get(); }
+  DlPaint& setPathEffect(std::shared_ptr<DlPathEffect> pathEffect) {
+    pathEffect_ = pathEffect;
+    return *this;
+  }
+
   bool operator==(DlPaint const& other) const;
   bool operator!=(DlPaint const& other) const { return !(*this == other); }
 
@@ -236,8 +247,8 @@ class DlPaint {
   std::shared_ptr<const DlColorFilter> colorFilter_;
   std::shared_ptr<const DlImageFilter> imageFilter_;
   std::shared_ptr<const DlMaskFilter> maskFilter_;
+  std::shared_ptr<const DlPathEffect> pathEffect_;
   // missing (as compared to SkPaint):
-  // DlPathEffect - waiting for https://github.com/flutter/engine/pull/32159
   // DlBlender - not planning on using that object in a pure DisplayList world
 };