Remove CFXColorFromString()
Fold it into its only caller. Then there is no need to instantiate
CPDF_DefaultAppearance twice.
Change-Id: I297632b8ce74cb9559932507a4a1251bc09c886a
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/130030
Reviewed-by: Thomas Sepez <tsepez@google.com>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfdoc/cpdf_color_utils.cpp b/core/fpdfdoc/cpdf_color_utils.cpp
index aa771b1..333aa40 100644
--- a/core/fpdfdoc/cpdf_color_utils.cpp
+++ b/core/fpdfdoc/cpdf_color_utils.cpp
@@ -32,9 +32,4 @@
return rt;
}
-CFX_Color CFXColorFromString(const ByteString& str) {
- CPDF_DefaultAppearance appearance(str);
- return appearance.GetColor().value_or(CFX_Color());
-}
-
} // namespace fpdfdoc
diff --git a/core/fpdfdoc/cpdf_color_utils.h b/core/fpdfdoc/cpdf_color_utils.h
index 05998cb..b487892 100644
--- a/core/fpdfdoc/cpdf_color_utils.h
+++ b/core/fpdfdoc/cpdf_color_utils.h
@@ -11,14 +11,9 @@
class CPDF_Array;
-namespace fxcrt {
-class ByteString;
-}
-
namespace fpdfdoc {
CFX_Color CFXColorFromArray(const CPDF_Array& array);
-CFX_Color CFXColorFromString(const fxcrt::ByteString& str);
} // namespace fpdfdoc
diff --git a/core/fpdfdoc/cpdf_generateap.cpp b/core/fpdfdoc/cpdf_generateap.cpp
index bd7b446..4ea0b2b 100644
--- a/core/fpdfdoc/cpdf_generateap.cpp
+++ b/core/fpdfdoc/cpdf_generateap.cpp
@@ -282,7 +282,7 @@
return DefaultAppearanceInfo{
.font_name = font.value(),
.font_size = font_size,
- .text_color = fpdfdoc::CFXColorFromString(default_appearance_string)};
+ .text_color = appearance.GetColor().value_or(CFX_Color())};
}
bool CloneResourcesDictIfMissingFromStream(CPDF_Dictionary* stream_dict,
