commit f9629a34ad671ef933272b6474095f41c9a362f7
author Lei Zhang <thestig@chromium.org> Mon Mar 11 21:56:06 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Mar 11 21:56:06 2024 +0000
tree e6329e031ee857a9b962d6416e01757a137b6b4b
parent 8fc2c9efb9016ce059d4d9365591740f71e7ca27

Rename CPDF_Color::GetRGB() to GetColorRef()

Since the return type is std::optional<FX_COLORREF>.

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

core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp

diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
index e2f6f82..dc09c61 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
@@ -58,7 +58,7 @@
     return false;
   }
 
-  std::optional<FX_COLORREF> colors = color->GetRGB();
+  std::optional<FX_COLORREF> colors = color->GetColorRef();
   if (!colors.has_value()) {
     return false;
   }

core/fpdfapi/page/cpdf_color.cpp

diff --git a/core/fpdfapi/page/cpdf_color.cpp b/core/fpdfapi/page/cpdf_color.cpp
index 5a1896d..83a60b1 100644
--- a/core/fpdfapi/page/cpdf_color.cpp
+++ b/core/fpdfapi/page/cpdf_color.cpp
@@ -79,7 +79,7 @@
          CPDF_ColorSpace::GetStockCS(CPDF_ColorSpace::Family::kDeviceRGB);
 }
 
-std::optional<FX_COLORREF> CPDF_Color::GetRGB() const {
+std::optional<FX_COLORREF> CPDF_Color::GetColorRef() const {
   if (IsPatternInternal()) {
     if (m_pValue) {
       return m_pCS->AsPatternCS()->GetPatternColorRef(*m_pValue);

core/fpdfapi/page/cpdf_color.h

diff --git a/core/fpdfapi/page/cpdf_color.h b/core/fpdfapi/page/cpdf_color.h
index 236b2f0..875417f 100644
--- a/core/fpdfapi/page/cpdf_color.h
+++ b/core/fpdfapi/page/cpdf_color.h
@@ -39,7 +39,7 @@
 
   uint32_t ComponentCount() const;
   bool IsColorSpaceRGB() const;
-  std::optional<FX_COLORREF> GetRGB() const;
+  std::optional<FX_COLORREF> GetColorRef() const;
 
   // Should only be called if IsPattern() returns true.
   RetainPtr<CPDF_Pattern> GetPattern() const;

core/fpdfapi/page/cpdf_colorstate.cpp

diff --git a/core/fpdfapi/page/cpdf_colorstate.cpp b/core/fpdfapi/page/cpdf_colorstate.cpp
index ee725a7..893a9c4 100644
--- a/core/fpdfapi/page/cpdf_colorstate.cpp
+++ b/core/fpdfapi/page/cpdf_colorstate.cpp
@@ -127,14 +127,14 @@
   if (!color.IsPattern()) {
     color.SetValueForNonPattern(std::move(values));
   }
-  return color.GetRGB().value_or(0xFFFFFFFF);
+  return color.GetColorRef().value_or(0xFFFFFFFF);
 }
 
 FX_COLORREF CPDF_ColorState::SetPattern(RetainPtr<CPDF_Pattern> pattern,
                                         pdfium::span<float> values,
                                         CPDF_Color& color) {
   color.SetValueForPattern(pattern, values);
-  std::optional<FX_COLORREF> colorref = color.GetRGB();
+  std::optional<FX_COLORREF> colorref = color.GetColorRef();
   if (colorref.has_value()) {
     return colorref.value();
   }