diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_bindings.inl b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_bindings.inl index abd2278aa4d394f3a5b55dc5ef042d1fd47789b2..cb27faf919941b4a5e6e10b05a2c0467a8c7382d 100644 --- a/frameworks/bridge/declarative_frontend/engine/jsi/jsi_bindings.inl +++ b/frameworks/bridge/declarative_frontend/engine/jsi/jsi_bindings.inl @@ -73,7 +73,6 @@ void JsiClass::Method(const char* name, FunctionBinding* bi customFunctions_.emplace( name, panda::Global( vm, panda::FunctionRef::New(vm, MethodCallback, nullptr, (void*)binding))); - } template diff --git a/frameworks/core/components_ng/pattern/custom_paint/canvas_paint_method.cpp b/frameworks/core/components_ng/pattern/custom_paint/canvas_paint_method.cpp index 95141a790a2008910d10546365d79c2bfa58c239..ff58eb985f3df3b47a1488f33fcb597c340bd90e 100644 --- a/frameworks/core/components_ng/pattern/custom_paint/canvas_paint_method.cpp +++ b/frameworks/core/components_ng/pattern/custom_paint/canvas_paint_method.cpp @@ -89,6 +89,16 @@ double GetQuality(const std::string& args) #endif } // namespace +CanvasPaintMethod::CanvasPaintMethod(RefPtr contentModifier, const RefPtr& frameNode) + : frameNode_(frameNode) +{ + matrix_.Reset(); + context_ = frameNode ? frameNode->GetContextRefPtr() : nullptr; + imageShadow_ = std::make_unique(); + contentModifier_ = contentModifier; + InitImageCallbacks(); +} + #ifndef USE_FAST_TASKPOOL void CanvasPaintMethod::PushTask(const TaskFunc& task) { diff --git a/frameworks/core/components_ng/pattern/custom_paint/canvas_paint_method.h b/frameworks/core/components_ng/pattern/custom_paint/canvas_paint_method.h index 8d6158596cb419cd39d07a1527403196a3d7e5b4..88e5a5d12a7c4f69197f2d7d1da546cb31bd76f8 100644 --- a/frameworks/core/components_ng/pattern/custom_paint/canvas_paint_method.h +++ b/frameworks/core/components_ng/pattern/custom_paint/canvas_paint_method.h @@ -34,17 +34,7 @@ class CanvasPaintMethod : public CustomPaintPaintMethod { DECLARE_ACE_TYPE(CanvasPaintMethod, CustomPaintPaintMethod) public: CanvasPaintMethod() = default; - CanvasPaintMethod(const WeakPtr context, RefPtr contentModifier, - const WeakPtr& frameNode) - : frameNode_(frameNode) - { - matrix_.Reset(); - context_ = context; - imageShadow_ = std::make_unique(); - contentModifier_ = contentModifier; - InitImageCallbacks(); - } - + CanvasPaintMethod(RefPtr contentModifier, const RefPtr& frameNode); ~CanvasPaintMethod() override = default; void GetFastTaskPool(); diff --git a/frameworks/core/components_ng/pattern/custom_paint/canvas_pattern.cpp b/frameworks/core/components_ng/pattern/custom_paint/canvas_pattern.cpp index 2a140a968954706c53c1ae8ea418864ff9575fa7..bf0b1fc2f0e73a97450335fd467a00137e0434f2 100644 --- a/frameworks/core/components_ng/pattern/custom_paint/canvas_pattern.cpp +++ b/frameworks/core/components_ng/pattern/custom_paint/canvas_pattern.cpp @@ -44,13 +44,10 @@ void CanvasPattern::OnAttachToFrameNode() renderCtx->SetClipToBounds(false); renderCtx->SetUsingContentRectForRenderFrame(true); renderCtx->SetFrameGravity(Rosen::Gravity::RESIZE_ASPECT_FILL); - auto context = PipelineBase::GetCurrentContext(); - CHECK_NULL_VOID(context); - if (!contentModifier_) { contentModifier_ = AceType::MakeRefPtr(); } - paintMethod_ = MakeRefPtr(context, contentModifier_, host); + paintMethod_ = MakeRefPtr(contentModifier_, host); #endif }