| commit | 833d705688d21402357ef1ab40f4706dbadfb79a | [log] [tgz] |
|---|---|---|
| author | Oliver Chang <ochang@chromium.org> | Tue Jan 19 15:15:37 2016 -0800 |
| committer | Oliver Chang <ochang@chromium.org> | Tue Jan 19 15:15:37 2016 -0800 |
| tree | 9dd1e6f25c069d2b46217bae036685b6e0e25a52 | |
| parent | 5c1efd404f6f0c6bc190101fad3a9977c4e2e6d2 [diff] |
Merge to XFA: Remove an extra "const" in fpdf_objects. TBR=weili@chromium.org Original Review URL: https://codereview.chromium.org/1602323002 . (cherry picked from commit b196c7bebad66c9938d2705ccf64961bcdd774e2) Review URL: https://codereview.chromium.org/1607473008 .
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h index fdf1172..a53907b 100644 --- a/core/include/fpdfapi/fpdf_objects.h +++ b/core/include/fpdfapi/fpdf_objects.h
@@ -102,7 +102,7 @@ ~CPDF_Object() {} void Destroy(); - const CPDF_Object* const GetBasicObject() const; + const CPDF_Object* GetBasicObject() const; FX_DWORD m_Type; FX_DWORD m_ObjNum;
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp index a3b0568..56f5a2c 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
@@ -46,7 +46,7 @@ } } -const CPDF_Object* const CPDF_Object::GetBasicObject() const { +const CPDF_Object* CPDF_Object::GetBasicObject() const { const CPDF_Reference* pRef = AsReference(); if (!pRef) { // This is not an indirect reference.