commit 10d48c7fd285f51e424fbaaaf3aa26f73cc6077a
author Lei Zhang <thestig@chromium.org> Wed Oct 21 17:45:26 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Oct 21 17:45:26 2020 +0000
tree eaec81654651cec34e29ae86c5e9e84af19808a5
parent 78a9e853fe37fd9b19853780f04e5e58a41bdcab

Move MakeMaybeAlphaRGBFormat() to the only file where it is used.

It is only used in cfx_windowsdib.cpp, so move it there from fx_dib.h.
Move MakeARGBFormat() for the same reason.

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

core/fxge/dib/fx_dib.cpp

diff --git a/core/fxge/dib/fx_dib.cpp b/core/fxge/dib/fx_dib.cpp
index 2cf8023..8d30aee 100644
--- a/core/fxge/dib/fx_dib.cpp
+++ b/core/fxge/dib/fx_dib.cpp
@@ -70,23 +70,6 @@
   }
 }
 
-FXDIB_Format MakeARGBFormat(int bpp) {
-  switch (bpp) {
-    case 8:
-      return FXDIB_Format::k8bppRgba;
-    case 24:
-      return FXDIB_Format::kRgba;
-    case 32:
-      return FXDIB_Format::kArgb;
-    default:
-      return FXDIB_Format::kInvalid;
-  }
-}
-
-FXDIB_Format MakeMaybeAlphaRGBFormat(bool alpha, int bpp) {
-  return alpha ? MakeARGBFormat(bpp) : MakeRGBFormat(bpp);
-}
-
 FXDIB_Format AddAlphaToCmykFormat(FXDIB_Format format) {
   switch (format) {
     case FXDIB_Format::k8bppCmyk:

core/fxge/dib/fx_dib.h

diff --git a/core/fxge/dib/fx_dib.h b/core/fxge/dib/fx_dib.h
index 454bef1..8feec78 100644
--- a/core/fxge/dib/fx_dib.h
+++ b/core/fxge/dib/fx_dib.h
@@ -131,8 +131,6 @@
 }
 
 FXDIB_Format MakeRGBFormat(int bpp);
-FXDIB_Format MakeARGBFormat(int bpp);
-FXDIB_Format MakeMaybeAlphaRGBFormat(bool alpha, int bpp);
 FXDIB_Format AddAlphaToCmykFormat(FXDIB_Format format);
 
 inline FX_CMYK CmykEncode(int c, int m, int y, int k) {

core/fxge/win32/cfx_windowsdib.cpp

diff --git a/core/fxge/win32/cfx_windowsdib.cpp b/core/fxge/win32/cfx_windowsdib.cpp
index 1d9df24..5d929df 100644
--- a/core/fxge/win32/cfx_windowsdib.cpp
+++ b/core/fxge/win32/cfx_windowsdib.cpp
@@ -24,6 +24,23 @@
   h = bmp.bmHeight;
 }
 
+FXDIB_Format MakeARGBFormat(int bpp) {
+  switch (bpp) {
+    case 8:
+      return FXDIB_Format::k8bppRgba;
+    case 24:
+      return FXDIB_Format::kRgba;
+    case 32:
+      return FXDIB_Format::kArgb;
+    default:
+      return FXDIB_Format::kInvalid;
+  }
+}
+
+FXDIB_Format MakeMaybeAlphaRGBFormat(bool alpha, int bpp) {
+  return alpha ? MakeARGBFormat(bpp) : MakeRGBFormat(bpp);
+}
+
 }  // namespace
 
 // static