commit bf0c157aee2ac1821a458581f83d8d213bf6a6ba
author Lei Zhang <thestig@chromium.org> Wed Sep 06 06:54:40 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Sep 06 06:54:40 2023 +0000
tree 1ad471fb7fb4bb66adfe80a4f07222fcef4e4ffb
parent c0991a43e00eb3357b863c210c9728e5f06c8ccc

Remove some useless CFX_DIBBase::RealizeIfNeeded() calls

In CGdiDeviceDriver, some of the RealizeIfNeeded() calls are not
necessary, as the CFX_DIBBase instances in question are really
CFX_DIBitmaps, which do not need to be "realized".

This is a follow-up to post-commit comments on
https://pdfium-review.googlesource.com/111433

Change-Id: I29e9c4ecac0d70074397e166baf2927d6c1644bf
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/111616
Reviewed-by: K. Moon <kmoon@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxge/win32/cgdi_device_driver.cpp

diff --git a/core/fxge/win32/cgdi_device_driver.cpp b/core/fxge/win32/cgdi_device_driver.cpp
index aa1d13f..e4c2b15 100644
--- a/core/fxge/win32/cgdi_device_driver.cpp
+++ b/core/fxge/win32/cgdi_device_driver.cpp
@@ -394,25 +394,22 @@
                                      int left,
                                      int top) {
   if (m_DeviceType == DeviceType::kPrinter) {
-    RetainPtr<CFX_DIBBase> flipped_source = source->FlipImage(false, true);
+    RetainPtr<const CFX_DIBBase> flipped_source =
+        source->FlipImage(/*bXFlip=*/false, /*bYFlip=*/true);
     if (!flipped_source) {
       return false;
     }
 
-    RetainPtr<const CFX_DIBBase> realized_source =
-        flipped_source->RealizeIfNeeded();
-    if (!realized_source) {
-      return false;
-    }
-    ByteString info = GetBitmapInfo(realized_source);
+    CHECK(!flipped_source->GetBuffer().empty());
+    ByteString info = GetBitmapInfo(flipped_source);
     ((BITMAPINFOHEADER*)info.c_str())->biHeight *= -1;
     FX_RECT dst_rect(0, 0, src_rect.Width(), src_rect.Height());
-    dst_rect.Intersect(0, 0, realized_source->GetWidth(),
-                       realized_source->GetHeight());
+    dst_rect.Intersect(0, 0, flipped_source->GetWidth(),
+                       flipped_source->GetHeight());
     int dst_width = dst_rect.Width();
     int dst_height = dst_rect.Height();
     ::StretchDIBits(m_hDC, left, top, dst_width, dst_height, 0, 0, dst_width,
-                    dst_height, realized_source->GetBuffer().data(),
+                    dst_height, flipped_source->GetBuffer().data(),
                     (BITMAPINFO*)info.c_str(), DIB_RGB_COLORS, SRCCOPY);
     return true;
   }
@@ -452,12 +449,8 @@
   if (m_DeviceType == DeviceType::kPrinter &&
       ((int64_t)source->GetWidth() * source->GetHeight() >
        (int64_t)abs(dest_width) * abs(dest_height))) {
-    RetainPtr<CFX_DIBBase> stretch_source = source->StretchTo(
-        dest_width, dest_height, FXDIB_ResampleOptions(), nullptr);
-    if (!stretch_source) {
-      return false;
-    }
-    realized_source = stretch_source->RealizeIfNeeded();
+    realized_source = source->StretchTo(dest_width, dest_height,
+                                        FXDIB_ResampleOptions(), nullptr);
   } else {
     realized_source = source->RealizeIfNeeded();
   }
@@ -465,6 +458,7 @@
     return false;
   }
 
+  CHECK(!realized_source->GetBuffer().empty());
   ByteString info = GetBitmapInfo(realized_source);
   ::StretchDIBits(m_hDC, dest_left, dest_top, dest_width, dest_height, 0, 0,
                   realized_source->GetWidth(), realized_source->GetHeight(),