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

fixed 8f4136b from https://gitee.com/seaside_wu/ace_ace_engine/pulls/1986

Browse Source 
add check layzforeach is nullptr and fix ic_public_drawer svg on PC
Preview

Signed-off-by: seaside_wu <wuhaibin5@huawei.com>
Change-Id: I840dd49b16c7d13f951ddb61d0e04c4856acc8da
This commit is contained in:
seaside_wu
2022-03-24 15:25:38 +08:00
committed by seaside
parent ee00c0c01a
commit 099a9ce12d
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/base/resource/internal_resource_previewer.cpp
+6 -6
View File
@@ -299,26 +299,26 @@ extern uint8_t* _binary_fa_black_clock_widget_second_png_end;
// Use objcopy transform to compiled object file.
// The following parameters represent the beginning and end of the file.
extern uint8_t _binary_ic_public_drawer_svg_start[];
extern uint8_t _binary_ic_public_drawer_svg_end[];
extern uint8_t* _binary_ic_public_drawer_svg_end;
// binary/container_modal_window_close.svg
extern uint8_t _binary_container_modal_window_close_svg_start[];
extern uint8_t _binary_container_modal_window_close_svg_end[];
extern uint8_t* _binary_container_modal_window_close_svg_end;
// binary/container_modal_window_maximize.svg
extern uint8_t _binary_container_modal_window_maximize_svg_start[];
extern uint8_t _binary_container_modal_window_maximize_svg_end[];
extern uint8_t* _binary_container_modal_window_maximize_svg_end;
// binary/container_modal_window_minimize.svg
extern uint8_t _binary_container_modal_window_minimize_svg_start[];
extern uint8_t _binary_container_modal_window_minimize_svg_end[];
extern uint8_t* _binary_container_modal_window_minimize_svg_end;
// binary/container_modal_window_recover.svg
extern uint8_t _binary_container_modal_window_recover_svg_start[];
extern uint8_t _binary_container_modal_window_recover_svg_end[];
extern uint8_t* _binary_container_modal_window_recover_svg_end;
// binary/container_modal_window_split_left.svg
extern uint8_t _binary_container_modal_window_split_left_svg_start[];
extern uint8_t _binary_container_modal_window_split_left_svg_end[];
extern uint8_t* _binary_container_modal_window_split_left_svg_end;
namespace OHOS::Ace {
namespace {
frameworks/core/components_v2/common/element_proxy.cpp
+4
View File
@@ -267,6 +267,10 @@ public:
LOGI("OnDataReloaded()");
ACE_SCOPED_TRACE("OnDataReloaded");
if (!lazyForEachComponent_) {
LOGE("lazyForEachCompenent_ is nullptr");
return;
}
LazyForEachCache cache(lazyForEachComponent_);
size_t oldCount = count_;
count_ = cache.TotalCount();