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" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-16 16:52:59 +00:00
committed by Android (Google) Code Review
parent 0abd07b3fb f267de7625
commit 717af18b7e
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,7 +77,18 @@ void draw_gl(int functor, void* data,
const uirenderer::DrawGlInfo& draw_gl_params, const uirenderer::DrawGlInfo& draw_gl_params,
const uirenderer::WebViewOverlayData& overlay_params) { const uirenderer::WebViewOverlayData& overlay_params) {
float gabcdef[7]; float gabcdef[7];
draw_gl_params.color_space_ptr->transferFn(gabcdef); if (draw_gl_params.color_space_ptr) {
draw_gl_params.color_space_ptr->transferFn(gabcdef);
} else {
// Assume sRGB.
gabcdef[0] = SkNamedTransferFn::kSRGB.g;
gabcdef[1] = SkNamedTransferFn::kSRGB.a;
gabcdef[2] = SkNamedTransferFn::kSRGB.b;
gabcdef[3] = SkNamedTransferFn::kSRGB.c;
gabcdef[4] = SkNamedTransferFn::kSRGB.d;
gabcdef[5] = SkNamedTransferFn::kSRGB.e;
gabcdef[6] = SkNamedTransferFn::kSRGB.f;
}
AwDrawFn_DrawGLParams params = { AwDrawFn_DrawGLParams params = {
.version = kAwDrawFnVersion, .version = kAwDrawFnVersion,
.clip_left = draw_gl_params.clipLeft, .clip_left = draw_gl_params.clipLeft,
@@ -147,7 +158,18 @@ void drawVk(int functor, void* data,
const uirenderer::WebViewOverlayData& overlay_params) { const uirenderer::WebViewOverlayData& overlay_params) {
SupportData* support = static_cast<SupportData*>(data); SupportData* support = static_cast<SupportData*>(data);
float gabcdef[7]; float gabcdef[7];
draw_vk_params.color_space_ptr->transferFn(gabcdef); if (draw_vk_params.color_space_ptr) {
draw_vk_params.color_space_ptr->transferFn(gabcdef);
} else {
// Assume sRGB.
gabcdef[0] = SkNamedTransferFn::kSRGB.g;
gabcdef[1] = SkNamedTransferFn::kSRGB.a;
gabcdef[2] = SkNamedTransferFn::kSRGB.b;
gabcdef[3] = SkNamedTransferFn::kSRGB.c;
gabcdef[4] = SkNamedTransferFn::kSRGB.d;
gabcdef[5] = SkNamedTransferFn::kSRGB.e;
gabcdef[6] = SkNamedTransferFn::kSRGB.f;
}
AwDrawFn_DrawVkParams params{ AwDrawFn_DrawVkParams params{
.version = kAwDrawFnVersion, .version = kAwDrawFnVersion,
.width = draw_vk_params.width, .width = draw_vk_params.width,