commit 82b9043ac36e307b1cbb5ec6b07c024afac38c71
author Lei Zhang <thestig@chromium.org> Sat Jan 14 00:52:30 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Jan 14 00:52:30 2023 +0000
tree e9148f22fb4317bd84ac0b3e100e61583ee7bbdc
parent 0fcb28e0816bea59cb28a4e2dfaf7bc0e4a184b8

Do no bother checking GetDeviceDriver() results in fx_skia_device.cpp.

GetDeviceDriver() should not return nullptr.

Change-Id: I6697dde70003c7979cdb6a08db68b7cc99717599
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/103233
Reviewed-by: Nigi <nigi@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxge/skia/fx_skia_device.cpp

diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index cf4040c..8847c17 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -2218,9 +2218,7 @@
 }
 
 void CFX_DefaultRenderDevice::Clear(uint32_t color) {
-  CFX_SkiaDeviceDriver* skDriver =
-      static_cast<CFX_SkiaDeviceDriver*>(GetDeviceDriver());
-  skDriver->Clear(color);
+  static_cast<CFX_SkiaDeviceDriver*>(GetDeviceDriver())->Clear(color);
 }
 
 std::unique_ptr<SkPictureRecorder> CFX_DefaultRenderDevice::CreateRecorder(
@@ -2278,10 +2276,8 @@
 
 void CFX_DefaultRenderDevice::DebugVerifyBitmapIsPreMultiplied() const {
 #ifdef SK_DEBUG
-  CFX_SkiaDeviceDriver* skDriver =
-      static_cast<CFX_SkiaDeviceDriver*>(GetDeviceDriver());
-  if (skDriver)
-    skDriver->DebugVerifyBitmapIsPreMultiplied();
+  static_cast<CFX_SkiaDeviceDriver*>(GetDeviceDriver())
+      ->DebugVerifyBitmapIsPreMultiplied();
 #endif  // SK_DEBUG
 }
 
@@ -2292,15 +2288,10 @@
     int top,
     int bitmap_alpha,
     BlendMode blend_type) {
-  CFX_SkiaDeviceDriver* skDriver =
-      static_cast<CFX_SkiaDeviceDriver*>(GetDeviceDriver());
-  if (skDriver) {
-    // Finish painting before drawing masks.
-    Flush(false);
-    return skDriver->SetBitsWithMask(pBitmap, pMask, left, top, bitmap_alpha,
-                                     blend_type);
-  }
-  return false;
+  // Finish painting before drawing masks.
+  Flush(false);
+  return static_cast<CFX_SkiaDeviceDriver*>(GetDeviceDriver())
+      ->SetBitsWithMask(pBitmap, pMask, left, top, bitmap_alpha, blend_type);
 }
 
 void CFX_DIBBase::DebugVerifyBufferIsPreMultiplied(void* arg) const {