Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6eafafe authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Null check color_space_ptr in draw functor" into sc-dev am: 717af18b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305824

Change-Id: I9edc912feb3b6f9e5fa012257dbd547eaed4c576
parents d7fbb1fe 717af18b

native/webview/plat_support/draw_functor.cpp

+24 −2
Original line number Diff line number Diff line
@@ -77,7 +77,18 @@ void draw_gl(int functor, void* data, 
             const uirenderer::DrawGlInfo& draw_gl_params,

             const uirenderer::WebViewOverlayData& overlay_params) {

  float gabcdef[7];

  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 = {

      .version = kAwDrawFnVersion,

      .clip_left = draw_gl_params.clipLeft,
@@ -147,7 +158,18 @@ void drawVk(int functor, void* data, 
            const uirenderer::WebViewOverlayData& overlay_params) {

  SupportData* support = static_cast<SupportData*>(data);

  float gabcdef[7];

  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{

      .version = kAwDrawFnVersion,

      .width = draw_vk_params.width,