summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-11-11 10:16:52 -0800
committerLei Zhang <thestig@chromium.org>2015-11-11 10:16:52 -0800
commitdd734def34bc31be370b168267ccba9705c7fc1b (patch)
treed486a83c2bfc7720bd6df0d823fd80bab567810e /core/include
parent4231e56531dc48d910b9e66dcbe6cde78df35c39 (diff)
downloadpdfium-dd734def34bc31be370b168267ccba9705c7fc1b.tar.xz
Merge to XFA: Cleanup CPDF_ApSettings and CJS_Parameters.
TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1432863004 . (cherry picked from commit 56e3da27d8bed8a6c03274b7b946e3f6d6ac11f4) Review URL: https://codereview.chromium.org/1436843003 .
Diffstat (limited to 'core/include')
-rw-r--r--core/include/fpdfdoc/fpdf_doc.h85
1 files changed, 41 insertions, 44 deletions
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h
index 6fcb671826..01750d82d6 100644
--- a/core/include/fpdfdoc/fpdf_doc.h
+++ b/core/include/fpdfdoc/fpdf_doc.h
@@ -949,7 +949,7 @@ class CPDF_FormControl {
HighlightingMode GetHighlightingMode();
- FX_BOOL HasMKEntry(CFX_ByteString csEntry);
+ bool HasMKEntry(CFX_ByteString csEntry) const;
int GetRotation();
@@ -957,37 +957,37 @@ class CPDF_FormControl {
return GetColor(iColorType, "BC");
}
- inline FX_FLOAT GetOriginalBorderColor(int index) {
+ FX_FLOAT GetOriginalBorderColor(int index) {
return GetOriginalColor(index, "BC");
}
- inline void GetOriginalBorderColor(int& iColorType, FX_FLOAT fc[4]) {
+ void GetOriginalBorderColor(int& iColorType, FX_FLOAT fc[4]) {
GetOriginalColor(iColorType, fc, "BC");
}
- inline FX_ARGB GetBackgroundColor(int& iColorType) {
+ FX_ARGB GetBackgroundColor(int& iColorType) {
return GetColor(iColorType, "BG");
}
- inline FX_FLOAT GetOriginalBackgroundColor(int index) {
+ FX_FLOAT GetOriginalBackgroundColor(int index) {
return GetOriginalColor(index, "BG");
}
- inline void GetOriginalBackgroundColor(int& iColorType, FX_FLOAT fc[4]) {
+ void GetOriginalBackgroundColor(int& iColorType, FX_FLOAT fc[4]) {
GetOriginalColor(iColorType, fc, "BG");
}
- inline CFX_WideString GetNormalCaption() { return GetCaption("CA"); }
+ CFX_WideString GetNormalCaption() { return GetCaption("CA"); }
- inline CFX_WideString GetRolloverCaption() { return GetCaption("RC"); }
+ CFX_WideString GetRolloverCaption() { return GetCaption("RC"); }
- inline CFX_WideString GetDownCaption() { return GetCaption("AC"); }
+ CFX_WideString GetDownCaption() { return GetCaption("AC"); }
- inline CPDF_Stream* GetNormalIcon() { return GetIcon("I"); }
+ CPDF_Stream* GetNormalIcon() { return GetIcon("I"); }
- inline CPDF_Stream* GetRolloverIcon() { return GetIcon("RI"); }
+ CPDF_Stream* GetRolloverIcon() { return GetIcon("RI"); }
- inline CPDF_Stream* GetDownIcon() { return GetIcon("IX"); }
+ CPDF_Stream* GetDownIcon() { return GetIcon("IX"); }
CPDF_IconFit GetIconFit();
@@ -1024,7 +1024,7 @@ class CPDF_FormControl {
CPDF_Stream* GetIcon(CFX_ByteString csEntry);
- CPDF_ApSettings GetMK(FX_BOOL bCreate);
+ CPDF_ApSettings GetMK() const;
CPDF_InterForm* m_pForm;
@@ -1113,74 +1113,71 @@ class CPDF_ViewerPreferences {
class CPDF_ApSettings {
public:
- // TODO(thestig): Examine why this cannot be explicit.
- CPDF_ApSettings(CPDF_Dictionary* pDict = NULL) { m_pDict = pDict; }
-
- operator CPDF_Dictionary*() const { return m_pDict; }
-
- FX_BOOL HasMKEntry(const CFX_ByteStringC& csEntry);
+ explicit CPDF_ApSettings(CPDF_Dictionary* pDict);
- int GetRotation();
+ bool HasMKEntry(const CFX_ByteStringC& csEntry) const;
+ int GetRotation() const;
- inline FX_ARGB GetBorderColor(int& iColorType) {
+ FX_ARGB GetBorderColor(int& iColorType) const {
return GetColor(iColorType, FX_BSTRC("BC"));
}
- inline FX_FLOAT GetOriginalBorderColor(int index) {
+ FX_FLOAT GetOriginalBorderColor(int index) const {
return GetOriginalColor(index, FX_BSTRC("BC"));
}
- inline void GetOriginalBorderColor(int& iColorType, FX_FLOAT fc[4]) {
+ void GetOriginalBorderColor(int& iColorType, FX_FLOAT fc[4]) const {
GetOriginalColor(iColorType, fc, FX_BSTRC("BC"));
}
- inline FX_ARGB GetBackgroundColor(int& iColorType) {
+ FX_ARGB GetBackgroundColor(int& iColorType) const {
return GetColor(iColorType, FX_BSTRC("BG"));
}
- inline FX_FLOAT GetOriginalBackgroundColor(int index) {
+ FX_FLOAT GetOriginalBackgroundColor(int index) const {
return GetOriginalColor(index, FX_BSTRC("BG"));
}
- inline void GetOriginalBackgroundColor(int& iColorType, FX_FLOAT fc[4]) {
+ void GetOriginalBackgroundColor(int& iColorType, FX_FLOAT fc[4]) const {
GetOriginalColor(iColorType, fc, FX_BSTRC("BG"));
}
- inline CFX_WideString GetNormalCaption() {
- return GetCaption(FX_BSTRC("CA"));
- }
+ CFX_WideString GetNormalCaption() const { return GetCaption(FX_BSTRC("CA")); }
- inline CFX_WideString GetRolloverCaption() {
+ CFX_WideString GetRolloverCaption() const {
return GetCaption(FX_BSTRC("RC"));
}
- inline CFX_WideString GetDownCaption() { return GetCaption(FX_BSTRC("AC")); }
-
- inline CPDF_Stream* GetNormalIcon() { return GetIcon(FX_BSTRC("I")); }
+ CFX_WideString GetDownCaption() const { return GetCaption(FX_BSTRC("AC")); }
- inline CPDF_Stream* GetRolloverIcon() { return GetIcon(FX_BSTRC("RI")); }
+ CPDF_Stream* GetNormalIcon() const { return GetIcon(FX_BSTRC("I")); }
- inline CPDF_Stream* GetDownIcon() { return GetIcon(FX_BSTRC("IX")); }
+ CPDF_Stream* GetRolloverIcon() const { return GetIcon(FX_BSTRC("RI")); }
- CPDF_IconFit GetIconFit();
+ CPDF_Stream* GetDownIcon() const { return GetIcon(FX_BSTRC("IX")); }
- int GetTextPosition();
+ CPDF_IconFit GetIconFit() const;
- CPDF_Dictionary* m_pDict;
+ int GetTextPosition() const;
protected:
- FX_ARGB GetColor(int& iColorType, const CFX_ByteStringC& csEntry);
+ friend class CPDF_FormControl;
- FX_FLOAT GetOriginalColor(int index, const CFX_ByteStringC& csEntry);
+ FX_ARGB GetColor(int& iColorType, const CFX_ByteStringC& csEntry) const;
+
+ FX_FLOAT GetOriginalColor(int index, const CFX_ByteStringC& csEntry) const;
void GetOriginalColor(int& iColorType,
FX_FLOAT fc[4],
- const CFX_ByteStringC& csEntry);
+ const CFX_ByteStringC& csEntry) const;
- CFX_WideString GetCaption(const CFX_ByteStringC& csEntry);
+ CFX_WideString GetCaption(const CFX_ByteStringC& csEntry) const;
- CPDF_Stream* GetIcon(const CFX_ByteStringC& csEntry);
- friend class CPDF_FormControl;
+ CPDF_Stream* GetIcon(const CFX_ByteStringC& csEntry) const;
+
+ CPDF_Dictionary* const m_pDict;
};
+CFX_WideString FILESPEC_EncodeFileName(const CFX_WideStringC& filepath);
+
#endif // CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_