From e316772b1b183e9e8dee04e9c159109d866d08b3 Mon Sep 17 00:00:00 2001 From: jinsenjun Date: Mon, 8 Nov 2021 15:00:50 +0800 Subject: [PATCH 1/3] Solve the problem that the input method keyboard cannot be displayed Signed-off-by: sunfei Change-Id: Iaf7531e031850b671c718d4d01333d768d588a40 --- engine/flutter/shell/platform/ohos/ohos_surface_software.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/flutter/shell/platform/ohos/ohos_surface_software.cc b/engine/flutter/shell/platform/ohos/ohos_surface_software.cc index 67ae871a..694eb0ea 100644 --- a/engine/flutter/shell/platform/ohos/ohos_surface_software.cc +++ b/engine/flutter/shell/platform/ohos/ohos_surface_software.cc @@ -173,7 +173,7 @@ void OhosSurfaceSoftware::SurfaceDrawBuffer( std::unique_ptr canvas = SkCanvas::MakeRasterDirect( native_image_info, surfaceBuffer->GetVirAddr(), - surfaceBuffer->GetSize() / requestConfig.height); + surfaceBuffer->GetBufferHandle()->stride); if (canvas) { SkBitmap bitmap; -- Gitee From ff5439652957fe792395f2897cb394bd95cb7240 Mon Sep 17 00:00:00 2001 From: huye Date: Thu, 11 Nov 2021 16:40:49 +0800 Subject: [PATCH 2/3] Eliminate the influence of offset on mask Signed-off-by: sunfei Change-Id: Id23706517930061178dc47dc15c13ec5bcbccb9f --- engine/flutter/flow/layers/mask_layer.cc | 19 +++++++++++-------- .../flutter/flow/ohos_layers/mask_layer.cpp | 5 ++++- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/engine/flutter/flow/layers/mask_layer.cc b/engine/flutter/flow/layers/mask_layer.cc index 837c08c4..a35b4072 100644 --- a/engine/flutter/flow/layers/mask_layer.cc +++ b/engine/flutter/flow/layers/mask_layer.cc @@ -35,16 +35,19 @@ void MaskLayer::Paint(PaintContext& context) const { mask_filter.setColorFilter(filter); skCanvas->saveLayer(maskBounds, &mask_filter); if (isSvgMask_) { - SkAutoCanvasRestore maskSave(skCanvas, true); - skCanvas->translate(maskBounds.fLeft + svgX_, maskBounds.fTop + svgY_); - skCanvas->scale(scaleX_, scaleY_); - svgDom_->render(skCanvas); + SkAutoCanvasRestore maskSave(skCanvas, true); + skCanvas->translate(maskBounds.fLeft + svgX_, maskBounds.fTop + svgY_); + skCanvas->scale(scaleX_, scaleY_); + svgDom_->render(skCanvas); } else if (isGradientMask_) { - skCanvas->drawRect(maskBounds, maskPaint_); + SkAutoCanvasRestore maskSave(skCanvas, true); + skCanvas->translate(maskBounds.fLeft, maskBounds.fTop); + SkRect skRect = SkRect::MakeIWH(maskBounds.fRight - maskBounds.fLeft, maskBounds.fBottom - maskBounds.fTop); + skCanvas->drawRect(skRect, maskPaint_); } else if (isPathMask_) { - SkAutoCanvasRestore maskSave(skCanvas, true); - skCanvas->translate(maskBounds.fLeft, maskBounds.fTop); - skCanvas->drawPath(maskPath_, maskPaint_); + SkAutoCanvasRestore maskSave(skCanvas, true); + skCanvas->translate(maskBounds.fLeft, maskBounds.fTop); + skCanvas->drawPath(maskPath_, maskPaint_); } // back to mask layer diff --git a/engine/flutter/flow/ohos_layers/mask_layer.cpp b/engine/flutter/flow/ohos_layers/mask_layer.cpp index 60ee2625..83a91176 100644 --- a/engine/flutter/flow/ohos_layers/mask_layer.cpp +++ b/engine/flutter/flow/ohos_layers/mask_layer.cpp @@ -41,7 +41,10 @@ void MaskLayer::Paint(const PaintContext& paintContext) const skCanvas_->scale(scaleX_, scaleY_); svgDom_->render(skCanvas_); } else if (isGradientMask_) { - skCanvas_->drawRect(maskBounds, maskPaint_); + SkAutoCanvasRestore maskSave(paintContext.skCanvas, true); + skCanvas_->translate(maskBounds.fLeft, maskBounds.fTop); + SkRect skRect = SkRect::MakeIWH(maskBounds.fRight - maskBounds.fLeft, maskBounds.fBottom - maskBounds.fTop); + skCanvas_->drawRect(skRect, maskPaint_); } else if (isPathMask_) { SkAutoCanvasRestore maskSave(paintContext.skCanvas, true); skCanvas_->translate(maskBounds.fLeft, maskBounds.fTop); -- Gitee From dd0bb53dc9b22498c7ec0302dcfd5737e71ee70e Mon Sep 17 00:00:00 2001 From: huzeqi Date: Fri, 10 Dec 2021 17:59:56 +0800 Subject: [PATCH 3/3] 1210 citu clean Signed-off-by: sunfei Change-Id: I83ecc610c5a9783e207ad606595e00db0cc7e09f --- OAT.xml | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/OAT.xml b/OAT.xml index 9c26bd51..c7dad724 100644 --- a/OAT.xml +++ b/OAT.xml @@ -87,9 +87,84 @@ Note:If the text contains special characters, please escape them according to th + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- Gitee