diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-03-28 21:10:35 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-03-28 21:10:35 +0000 |
| commit | a17a0e219d5fcd4b8714cf97e8daf119d4388bee (patch) | |
| tree | 158f81e700398e3e4fc7cb03111b79746d485fdd /core/fpdfdoc/cpdf_defaultappearance.h | |
| parent | cbf76e656042e3d9778ccc114983ab6a3c19ff92 (diff) | |
| download | pdfium-a17a0e219d5fcd4b8714cf97e8daf119d4388bee.tar.xz | |
Remove CPDF_DefaultAppearance reference params
This CL converts the CPDF_DefaultAppearance::GetColor methods to return
instead of using reference parameters.
Change-Id: I9ba6bf060a536290a83d3c9ce6e115511f28664c
Reviewed-on: https://pdfium-review.googlesource.com/29410
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'core/fpdfdoc/cpdf_defaultappearance.h')
| -rw-r--r-- | core/fpdfdoc/cpdf_defaultappearance.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/fpdfdoc/cpdf_defaultappearance.h b/core/fpdfdoc/cpdf_defaultappearance.h index 79ad0bb526..79578930e1 100644 --- a/core/fpdfdoc/cpdf_defaultappearance.h +++ b/core/fpdfdoc/cpdf_defaultappearance.h @@ -7,11 +7,13 @@ #ifndef CORE_FPDFDOC_CPDF_DEFAULTAPPEARANCE_H_ #define CORE_FPDFDOC_CPDF_DEFAULTAPPEARANCE_H_ +#include <utility> + #include "core/fpdfapi/parser/cpdf_simple_parser.h" -#include "core/fpdfdoc/cpdf_defaultappearance.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" +#include "core/fxge/cfx_color.h" #include "core/fxge/fx_dib.h" enum class BorderStyle { SOLID, DASH, BEVELED, INSET, UNDERLINE }; @@ -27,8 +29,8 @@ class CPDF_DefaultAppearance { ByteString GetFont(float* fFontSize); bool HasColor(); - void GetColor(int& iColorType, float fc[4]); - void GetColor(FX_ARGB& color, int& iColorType); + CFX_Color::Type GetColor(float fc[4]); + std::pair<CFX_Color::Type, FX_ARGB> GetColor(); bool FindTagParamFromStartForTesting(CPDF_SimpleParser* parser, const ByteStringView& token, |