Commit 2dbb15c9 authored by Nico Weber's avatar Nico Weber

Remove unneeded null checks in ImageBitmap.cpp.

`new` never returns nullptr per standard (in Chromium, we crash the process
on out-of-memory instead).

Also, in the first case, the image in the ImageBitmap is checked for nullness
right above, so that check isn't needed either.

Bug: 805881
Change-Id: Ieff5bdf15813bfb0f3087ec925f74ecacc77df7c
Reviewed-on: https://chromium-review.googlesource.com/887758Reviewed-by: default avatarMohammad Reza Zakerinasab <zakerinasab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532503}
parent b4fbf923
...@@ -821,15 +821,8 @@ void ImageBitmap::ResolvePromiseOnOriginalThread( ...@@ -821,15 +821,8 @@ void ImageBitmap::ResolvePromiseOnOriginalThread(
return; return;
} }
ImageBitmap* bitmap = new ImageBitmap(image); ImageBitmap* bitmap = new ImageBitmap(image);
if (bitmap && bitmap->BitmapImage()) bitmap->BitmapImage()->SetOriginClean(origin_clean);
bitmap->BitmapImage()->SetOriginClean(origin_clean); resolver->Resolve(bitmap);
if (bitmap && bitmap->BitmapImage()) {
resolver->Resolve(bitmap);
} else {
resolver->Reject(
ScriptValue(resolver->GetScriptState(),
v8::Null(resolver->GetScriptState()->GetIsolate())));
}
} }
void ImageBitmap::RasterizeImageOnBackgroundThread( void ImageBitmap::RasterizeImageOnBackgroundThread(
...@@ -887,11 +880,9 @@ ScriptPromise ImageBitmap::CreateAsync(ImageElementBase* image, ...@@ -887,11 +880,9 @@ ScriptPromise ImageBitmap::CreateAsync(ImageElementBase* image,
// poremultiply_alpha. // poremultiply_alpha.
if (src_rect.IsEmpty()) { if (src_rect.IsEmpty()) {
ImageBitmap* bitmap = new ImageBitmap(MakeBlankImage(parsed_options)); ImageBitmap* bitmap = new ImageBitmap(MakeBlankImage(parsed_options));
if (bitmap && bitmap->BitmapImage()) { if (bitmap->BitmapImage()) {
bitmap->BitmapImage()->SetOriginClean( bitmap->BitmapImage()->SetOriginClean(
!image->WouldTaintOrigin(document->GetSecurityOrigin())); !image->WouldTaintOrigin(document->GetSecurityOrigin()));
}
if (bitmap && bitmap->BitmapImage()) {
resolver->Resolve(bitmap); resolver->Resolve(bitmap);
} else { } else {
resolver->Reject( resolver->Reject(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment