diff options
author | Lei Zhang <thestig@chromium.org> | 2015-12-14 15:50:28 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-12-14 15:50:28 -0800 |
commit | 1956a174020686f91cd3b34294e91f4560fe45aa (patch) | |
tree | 25b21d226c9031e1a0748ddcc455214185585668 /core/include | |
parent | 1407c979a3ba8599546468d461f5403f317bddd3 (diff) | |
download | pdfium-1956a174020686f91cd3b34294e91f4560fe45aa.tar.xz |
Remove FX_BSTRC.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1521563002 .
Diffstat (limited to 'core/include')
-rw-r--r-- | core/include/fpdfapi/fpdf_parser.h | 9 | ||||
-rw-r--r-- | core/include/fpdfdoc/fpdf_doc.h | 26 | ||||
-rw-r--r-- | core/include/fxcrt/fx_string.h | 1 |
3 files changed, 16 insertions, 20 deletions
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h index ad85de4c9a..a266b20ba2 100644 --- a/core/include/fpdfapi/fpdf_parser.h +++ b/core/include/fpdfapi/fpdf_parser.h @@ -313,11 +313,10 @@ class CPDF_SyntaxParser { void GetNextWord(); - FX_BOOL IsWholeWord(FX_FILESIZE startpos, - FX_FILESIZE limit, - const uint8_t* tag, - FX_DWORD taglen, - FX_BOOL checkKeyword); + bool IsWholeWord(FX_FILESIZE startpos, + FX_FILESIZE limit, + const CFX_ByteStringC& tag, + FX_BOOL checkKeyword); CFX_ByteString ReadString(); diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h index 2633017013..6163440674 100644 --- a/core/include/fpdfdoc/fpdf_doc.h +++ b/core/include/fpdfdoc/fpdf_doc.h @@ -1091,42 +1091,40 @@ class CPDF_ApSettings { int GetRotation() const; FX_ARGB GetBorderColor(int& iColorType) const { - return GetColor(iColorType, FX_BSTRC("BC")); + return GetColor(iColorType, "BC"); } FX_FLOAT GetOriginalBorderColor(int index) const { - return GetOriginalColor(index, FX_BSTRC("BC")); + return GetOriginalColor(index, "BC"); } void GetOriginalBorderColor(int& iColorType, FX_FLOAT fc[4]) const { - GetOriginalColor(iColorType, fc, FX_BSTRC("BC")); + GetOriginalColor(iColorType, fc, "BC"); } FX_ARGB GetBackgroundColor(int& iColorType) const { - return GetColor(iColorType, FX_BSTRC("BG")); + return GetColor(iColorType, "BG"); } FX_FLOAT GetOriginalBackgroundColor(int index) const { - return GetOriginalColor(index, FX_BSTRC("BG")); + return GetOriginalColor(index, "BG"); } void GetOriginalBackgroundColor(int& iColorType, FX_FLOAT fc[4]) const { - GetOriginalColor(iColorType, fc, FX_BSTRC("BG")); + GetOriginalColor(iColorType, fc, "BG"); } - CFX_WideString GetNormalCaption() const { return GetCaption(FX_BSTRC("CA")); } + CFX_WideString GetNormalCaption() const { return GetCaption("CA"); } - CFX_WideString GetRolloverCaption() const { - return GetCaption(FX_BSTRC("RC")); - } + CFX_WideString GetRolloverCaption() const { return GetCaption("RC"); } - CFX_WideString GetDownCaption() const { return GetCaption(FX_BSTRC("AC")); } + CFX_WideString GetDownCaption() const { return GetCaption("AC"); } - CPDF_Stream* GetNormalIcon() const { return GetIcon(FX_BSTRC("I")); } + CPDF_Stream* GetNormalIcon() const { return GetIcon("I"); } - CPDF_Stream* GetRolloverIcon() const { return GetIcon(FX_BSTRC("RI")); } + CPDF_Stream* GetRolloverIcon() const { return GetIcon("RI"); } - CPDF_Stream* GetDownIcon() const { return GetIcon(FX_BSTRC("IX")); } + CPDF_Stream* GetDownIcon() const { return GetIcon("IX"); } CPDF_IconFit GetIconFit() const; diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h index f493c53ed9..1c1e237076 100644 --- a/core/include/fxcrt/fx_string.h +++ b/core/include/fxcrt/fx_string.h @@ -135,7 +135,6 @@ inline bool operator==(const char* lhs, const CFX_ByteStringC& rhs) { inline bool operator!=(const char* lhs, const CFX_ByteStringC& rhs) { return rhs != lhs; } -#define FX_BSTRC(str) CFX_ByteStringC(str, sizeof str - 1) #define FXBSTR_ID(c1, c2, c3, c4) ((c1 << 24) | (c2 << 16) | (c3 << 8) | (c4)) // A mutable string with shared buffers using copy-on-write semantics that |