commit 6f1b15f6fb27b155e4f6cc565f398739198e1e2e
author Lei Zhang <thestig@chromium.org> Fri Jan 17 22:29:21 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Jan 17 22:29:21 2020 +0000
tree d58699a1c401ed8c270df40e231ce43f5deff993
parent ea020fde461302941562bce270e14f7a1db886f7

Mark |CFX_AggDeviceDriver::m_pBitmap| const.

Once it is const, we can assert it is non-null once in the ctor, and
remove any other checks for |m_pBitmap| being null.

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

core/fxge/agg/fx_agg_driver.cpp

diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
index ca8d591..b2a7986 100644
--- a/core/fxge/agg/fx_agg_driver.cpp
+++ b/core/fxge/agg/fx_agg_driver.cpp
@@ -1139,6 +1139,7 @@
       m_bRgbByteOrder(bRgbByteOrder),
       m_bGroupKnockout(bGroupKnockout),
       m_pBackdropBitmap(pBackdropBitmap) {
+  ASSERT(m_pBitmap);
   InitPlatform();
 }
 
@@ -1475,7 +1476,7 @@
 bool CFX_AggDeviceDriver::GetDIBits(const RetainPtr<CFX_DIBitmap>& pBitmap,
                                     int left,
                                     int top) {
-  if (!m_pBitmap || !m_pBitmap->GetBuffer())
+  if (!m_pBitmap->GetBuffer())
     return true;
 
   FX_RECT rect(left, top, left + pBitmap->GetWidth(),

core/fxge/agg/fx_agg_driver.h

diff --git a/core/fxge/agg/fx_agg_driver.h b/core/fxge/agg/fx_agg_driver.h
index 0fe10a4..0578421 100644
--- a/core/fxge/agg/fx_agg_driver.h
+++ b/core/fxge/agg/fx_agg_driver.h
@@ -111,7 +111,7 @@
   virtual uint8_t* GetBuffer() const;
 
  private:
-  RetainPtr<CFX_DIBitmap> m_pBitmap;
+  RetainPtr<CFX_DIBitmap> const m_pBitmap;
   std::unique_ptr<CFX_ClipRgn> m_pClipRgn;
   std::vector<std::unique_ptr<CFX_ClipRgn>> m_StateStack;
 #if defined(OS_MACOSX)