openharmony/ace_ace_engine
1
0
Fork 0
mirror of https://github.com/openharmony/ace_ace_engine.git synced 2026-07-19 14:43:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

!2172 fix debug version compile and decheck issue

Browse Source 
Merge pull request !2172 from Sunfei/work_0218
This commit is contained in:
openharmony_ci
2022-04-11 02:02:54 +00:00
committed by Gitee
parent bccfc44bcf d883887983
commit cc8ac8cd4e
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/core/components_v2/tabs/tab_content_proxy_element.h
+1 -1
View File
@@ -27,7 +27,7 @@
namespace OHOS::Ace::V2 {
class TabContentProxyElement : public TabContentElement, private ElementProxyHost {
DECLARE_ACE_TYPE(TabContentElement, TabContentElement);
DECLARE_ACE_TYPE(TabContentProxyElement, TabContentElement);
public:
explicit TabContentProxyElement(const std::list<RefPtr<Component>>& contents) : TabContentElement(contents) {};
frameworks/core/image/image_object.cpp
+13 -15
View File
@@ -160,21 +160,19 @@ void StaticImageObject::UploadToGpuForRender(
return;
}
auto image = ImageProvider::ResizeSkImage(rawImage, imageSource.GetSrc(), imageSize, forceResize);
auto callback =
[successCallback, imageSource, taskExecutor, imageCache, imageSize](flutter::SkiaGPUObject<SkImage> image) {
auto canvasImage = flutter::CanvasImage::Create();
canvasImage->set_image(std::move(image));
if (imageCache) {
LOGD("cache image key: %{public}s", GenerateCacheKey(imageSource, imageSize).c_str());
imageCache->CacheImage(
GenerateCacheKey(imageSource, imageSize),
std::make_shared<CachedImage>(canvasImage));
}
taskExecutor->PostTask(
[ successCallback, imageSource, canvasImage ] {
successCallback(imageSource, canvasImage);
},
TaskExecutor::TaskType::UI);
auto callback = [successCallback, imageSource, taskExecutor, imageCache, imageSize,
id = Container::CurrentId()](flutter::SkiaGPUObject<SkImage> image) {
ContainerScope scope(id);
auto canvasImage = flutter::CanvasImage::Create();
canvasImage->set_image(std::move(image));
if (imageCache) {
LOGD("cache image key: %{public}s", GenerateCacheKey(imageSource, imageSize).c_str());
imageCache->CacheImage(
GenerateCacheKey(imageSource, imageSize), std::make_shared<CachedImage>(canvasImage));
}
taskExecutor->PostTask(
[successCallback, imageSource, canvasImage] { successCallback(imageSource, canvasImage); },
TaskExecutor::TaskType::UI);
};
ImageProvider::UploadImageToGPUForRender(image, callback, renderTaskHolder);
};