Return null instead of DCHECKing in PerturbPixelsInternal

handle null appropriately in other callers
brave · Dec 11, 2020 · 2713a4a · 2713a4a
1 parent aca167d
commit 2713a4a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/chromium_src/third_party/blink/renderer/core/execution_context/execution_context.cc b/chromium_src/third_party/blink/renderer/core/execution_context/execution_context.cc
@@ -176,7 +176,8 @@ scoped_refptr<blink::StaticBitmapImage> BraveSessionCache::PerturbPixels(
 scoped_refptr<blink::StaticBitmapImage>
 BraveSessionCache::PerturbPixelsInternal(
     scoped_refptr<blink::StaticBitmapImage> image_bitmap) {
-  DCHECK(image_bitmap);
+  if (!image_bitmap)
+    return nullptr;
   if (image_bitmap->IsNull())
     return image_bitmap;
   // convert to an ImageDataBuffer to normalize the pixel data to RGBA, 4 bytes

diff --git a/chromium_src/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/chromium_src/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
@@ -14,6 +14,7 @@
           brave::GetContentSettingsClientFor(context)) {                      \
     image_ = brave::BraveSessionCache::From(*context).PerturbPixels(settings, \
                                                                     image_);  \
+    DCHECK(image_);                                                           \
   }
 
 #include "../../../../../../../../third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc"

diff --git a/chromium_src/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/chromium_src/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
@@ -15,6 +15,8 @@
             brave::GetContentSettingsClientFor(context)) {                   \
       image_bitmap = brave::BraveSessionCache::From(*context).PerturbPixels( \
           settings, image_bitmap);                                           \
+      if (!image_bitmap)                                                     \
+        return String("data:,");                                             \
     }                                                                        \
   }