summaryrefslogtreecommitdiff
path: root/core/fpdfapi/fpdf_parser/include
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-03-29 14:51:50 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-29 14:51:50 -0700
commitbd56755ba86f2d87e24a3cee5cb92aa14a81bb27 (patch)
treefb4692dc44cb549b7149be080ec26f4b7cd7b086 /core/fpdfapi/fpdf_parser/include
parent7f432a1c87014d6673ee69ff0ffa3724f237acf4 (diff)
downloadpdfium-bd56755ba86f2d87e24a3cee5cb92aa14a81bb27.tar.xz
Rename GetElementValue() to GetDirectObject{By,At}().
Every time I read this code, I have to make the mental substituion that "Element value" means "de-ref indirect object", so it might as well just say so. BUG= Review URL: https://codereview.chromium.org/1841173002
Diffstat (limited to 'core/fpdfapi/fpdf_parser/include')
-rw-r--r--core/fpdfapi/fpdf_parser/include/cpdf_array.h8
-rw-r--r--core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_array.h b/core/fpdfapi/fpdf_parser/include/cpdf_array.h
index 3efa03e0d5..ea367785ed 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_array.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_array.h
@@ -25,10 +25,8 @@ class CPDF_Array : public CPDF_Object {
const CPDF_Array* AsArray() const override;
uint32_t GetCount() const { return m_Objects.GetSize(); }
- CPDF_Object* GetElement(uint32_t index) const;
- CPDF_Object* GetElementValue(uint32_t index) const;
- CFX_Matrix GetMatrix();
- CFX_FloatRect GetRect();
+ CPDF_Object* GetObjectAt(uint32_t index) const;
+ CPDF_Object* GetDirectObjectAt(uint32_t index) const;
CFX_ByteString GetStringAt(uint32_t index) const;
CFX_ByteStringC GetConstStringAt(uint32_t index) const;
int GetIntegerAt(uint32_t index) const;
@@ -37,6 +35,8 @@ class CPDF_Array : public CPDF_Object {
CPDF_Stream* GetStreamAt(uint32_t index) const;
CPDF_Array* GetArrayAt(uint32_t index) const;
FX_FLOAT GetFloatAt(uint32_t index) const { return GetNumberAt(index); }
+ CFX_Matrix GetMatrix();
+ CFX_FloatRect GetRect();
void SetAt(uint32_t index,
CPDF_Object* pObj,
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h b/core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h
index 73eabf9368..82abc35c02 100644
--- a/core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h
+++ b/core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h
@@ -31,8 +31,8 @@ class CPDF_Dictionary : public CPDF_Object {
const CPDF_Dictionary* AsDictionary() const override;
size_t GetCount() const { return m_Map.size(); }
- CPDF_Object* GetElement(const CFX_ByteStringC& key) const;
- CPDF_Object* GetElementValue(const CFX_ByteStringC& key) const;
+ CPDF_Object* GetObjectBy(const CFX_ByteStringC& key) const;
+ CPDF_Object* GetDirectObjectBy(const CFX_ByteStringC& key) const;
CFX_ByteString GetStringBy(const CFX_ByteStringC& key) const;
CFX_ByteStringC GetConstStringBy(const CFX_ByteStringC& key) const;
CFX_ByteString GetStringBy(const CFX_ByteStringC& key,