Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Null check color_space_ptr in draw functor v2" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-19 17:23:38 +00:00
committed by Android (Google) Code Review
parent db2dd6d551 fe71933655
commit de41c86deb
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
native/webview/plat_support/draw_functor.cpp
View File

@@ -116,8 +116,14 @@ void draw_gl(int functor, void* data,
} }
COMPILE_ASSERT(sizeof(params.color_space_toXYZD50) == sizeof(skcms_Matrix3x3), COMPILE_ASSERT(sizeof(params.color_space_toXYZD50) == sizeof(skcms_Matrix3x3),
gamut_transform_size_mismatch); gamut_transform_size_mismatch);
draw_gl_params.color_space_ptr->toXYZD50( if (draw_gl_params.color_space_ptr) {
reinterpret_cast<skcms_Matrix3x3*>(&params.color_space_toXYZD50)); draw_gl_params.color_space_ptr->toXYZD50(
reinterpret_cast<skcms_Matrix3x3*>(&params.color_space_toXYZD50));
} else {
// Assume sRGB.
memcpy(&params.color_space_toXYZD50, &SkNamedGamut::kSRGB,
sizeof(params.color_space_toXYZD50));
}
SupportData* support = static_cast<SupportData*>(data); SupportData* support = static_cast<SupportData*>(data);
support->callbacks.draw_gl(functor, support->data, &params); support->callbacks.draw_gl(functor, support->data, &params);
@@ -196,8 +202,14 @@ void drawVk(int functor, void* data,
}; };
COMPILE_ASSERT(sizeof(params.color_space_toXYZD50) == sizeof(skcms_Matrix3x3), COMPILE_ASSERT(sizeof(params.color_space_toXYZD50) == sizeof(skcms_Matrix3x3),
gamut_transform_size_mismatch); gamut_transform_size_mismatch);
draw_vk_params.color_space_ptr->toXYZD50( if (draw_vk_params.color_space_ptr) {
reinterpret_cast<skcms_Matrix3x3*>(&params.color_space_toXYZD50)); draw_vk_params.color_space_ptr->toXYZD50(
reinterpret_cast<skcms_Matrix3x3*>(&params.color_space_toXYZD50));
} else {
// Assume sRGB.
memcpy(&params.color_space_toXYZD50, &SkNamedGamut::kSRGB,
sizeof(params.color_space_toXYZD50));
}
COMPILE_ASSERT(NELEM(params.transform) == NELEM(draw_vk_params.transform), COMPILE_ASSERT(NELEM(params.transform) == NELEM(draw_vk_params.transform),
mismatched_transform_matrix_sizes); mismatched_transform_matrix_sizes);
for (int i = 0; i < NELEM(params.transform); ++i) { for (int i = 0; i < NELEM(params.transform); ++i) {