commit 54cb316417dd00b16ff30d0062065c4e1157c353
author Lei Zhang <thestig@chromium.org> Fri Sep 20 17:39:47 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Sep 20 17:39:47 2019 +0000
tree 128e3f82a1fd5100226dd4d97e7b6cc0828c901c
parent b93f7decd493f62b06dfb36ebb377f59d4ba76fe

Remove IsArray() checks in CPDF_Array.

They are always going to return true.

Change-Id: I869432a7b57b28185c0b60030b6ad42de668520d
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/60992
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fpdfapi/parser/cpdf_array.cpp

diff --git a/core/fpdfapi/parser/cpdf_array.cpp b/core/fpdfapi/parser/cpdf_array.cpp
index a7ce4e6..0d66cb0 100644
--- a/core/fpdfapi/parser/cpdf_array.cpp
+++ b/core/fpdfapi/parser/cpdf_array.cpp
@@ -20,7 +20,7 @@
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
 
-CPDF_Array::CPDF_Array() {}
+CPDF_Array::CPDF_Array() = default;
 
 CPDF_Array::CPDF_Array(const WeakPtr<ByteStringPool>& pPool) : m_pPool(pPool) {}
 
@@ -70,7 +70,7 @@
 
 CFX_FloatRect CPDF_Array::GetRect() const {
   CFX_FloatRect rect;
-  if (!IsArray() || m_Objects.size() != 4)
+  if (m_Objects.size() != 4)
     return rect;
 
   rect.left = GetNumberAt(0);
@@ -81,7 +81,7 @@
 }
 
 CFX_Matrix CPDF_Array::GetMatrix() const {
-  if (!IsArray() || m_Objects.size() != 6)
+  if (m_Objects.size() != 6)
     return CFX_Matrix();
 
   return CFX_Matrix(GetNumberAt(0), GetNumberAt(1), GetNumberAt(2),
@@ -207,7 +207,6 @@
 
 CPDF_Object* CPDF_Array::SetAt(size_t index, RetainPtr<CPDF_Object> pObj) {
   CHECK(!IsLocked());
-  ASSERT(IsArray());
   ASSERT(!pObj || pObj->IsInline());
   if (index >= m_Objects.size()) {
     NOTREACHED();
@@ -220,7 +219,6 @@
 
 CPDF_Object* CPDF_Array::InsertAt(size_t index, RetainPtr<CPDF_Object> pObj) {
   CHECK(!IsLocked());
-  ASSERT(IsArray());
   CHECK(!pObj || pObj->IsInline());
   CPDF_Object* pRet = pObj.Get();
   if (index >= m_Objects.size()) {
@@ -236,7 +234,6 @@
 
 CPDF_Object* CPDF_Array::Add(RetainPtr<CPDF_Object> pObj) {
   CHECK(!IsLocked());
-  ASSERT(IsArray());
   CHECK(!pObj || pObj->IsInline());
   CPDF_Object* pRet = pObj.Get();
   m_Objects.push_back(std::move(pObj));