commit d3e3a40519842854cde1e6bce188245e9951011d
author Lei Zhang <thestig@chromium.org> Thu Aug 15 20:46:07 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Aug 15 20:46:07 2019 +0000
tree 232f56fe6a4ff4aab8248c4b0939dbce848ef371
parent fe8d4e30401757ebbbbf7c8a6e0430dc9e4d5ab0

Fix nits in Harness() in a Skia test.

Change-Id: If5308174b3aa66a651950e4126213a1bd30ece6b
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/59351
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxge/skia/fx_skia_device_embeddertest.cpp

diff --git a/core/fxge/skia/fx_skia_device_embeddertest.cpp b/core/fxge/skia/fx_skia_device_embeddertest.cpp
index 48734ee..d506555 100644
--- a/core/fxge/skia/fx_skia_device_embeddertest.cpp
+++ b/core/fxge/skia/fx_skia_device_embeddertest.cpp
@@ -119,18 +119,15 @@
 
 void Harness(void (*Test)(CFX_SkiaDeviceDriver*, const State&),
              const State& state) {
-  int h = 1;
-  int w = 4;
-  ScopedFPDFBitmap bitmap(FPDFBitmap_Create(w, h, 1));
-  EXPECT_NE(nullptr, bitmap);
-  if (!bitmap)
-    return;
-  FPDFBitmap_FillRect(bitmap.get(), 0, 0, w, h, 0x00000000);
-  CFX_DefaultRenderDevice geDevice;
+  constexpr int kWidth = 4;
+  constexpr int kHeight = 1;
+  ScopedFPDFBitmap bitmap(FPDFBitmap_Create(kWidth, kHeight, 1));
+  ASSERT_TRUE(bitmap);
+  FPDFBitmap_FillRect(bitmap.get(), 0, 0, kWidth, kHeight, 0x00000000);
+  CFX_DefaultRenderDevice device;
   RetainPtr<CFX_DIBitmap> pBitmap(CFXDIBitmapFromFPDFBitmap(bitmap.get()));
-  geDevice.Attach(pBitmap, false, nullptr, false);
-  CFX_SkiaDeviceDriver* driver =
-      static_cast<CFX_SkiaDeviceDriver*>(geDevice.GetDeviceDriver());
+  device.Attach(pBitmap, false, nullptr, false);
+  auto* driver = static_cast<CFX_SkiaDeviceDriver*>(device.GetDeviceDriver());
   (*Test)(driver, state);
   driver->Flush();
   uint32_t pixel = pBitmap->GetPixel(0, 0);