Merge to XFA: Add type cast definitions for CPDF_Name.

core/src/fpdfdoc/doc_tagged.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/fpdfapi/fpdf_parser.h"
 #include "../../include/fpdfapi/fpdf_page.h"
 #include "../../include/fpdfdoc/fpdf_tagged.h"
 #include "tagged_int.h"
@@ skipping 399 matching lines @@
   }
   return pArray->GetElementValue(subindex);
 }
 CFX_ByteString CPDF_StructElementImpl::GetName(
     const CFX_ByteStringC& owner,
     const CFX_ByteStringC& name,
     const CFX_ByteStringC& default_value,
     FX_BOOL bInheritable,
     int subindex) {
   CPDF_Object* pAttr = GetAttr(owner, name, bInheritable, subindex);
-  if (pAttr == NULL || pAttr->GetType() != PDFOBJ_NAME) {
-    return default_value;
-  }
-  return pAttr->GetString();
+  if (ToName(pAttr))
+    return pAttr->GetString();
+  return default_value;
 }
+
 FX_ARGB CPDF_StructElementImpl::GetColor(const CFX_ByteStringC& owner,
                                          const CFX_ByteStringC& name,
                                          FX_ARGB default_value,
                                          FX_BOOL bInheritable,
                                          int subindex) {
   CPDF_Object* pAttr = GetAttr(owner, name, bInheritable, subindex);
   if (pAttr == NULL || pAttr->GetType() != PDFOBJ_ARRAY) {
     return default_value;
   }
   CPDF_Array* pArray = (CPDF_Array*)pAttr;
@@ skipping 10 matching lines @@
   return ToNumber(pAttr) ? pAttr->GetNumber() : default_value;
 }
 int CPDF_StructElementImpl::GetInteger(const CFX_ByteStringC& owner,
                                        const CFX_ByteStringC& name,
                                        int default_value,
                                        FX_BOOL bInheritable,
                                        int subindex) {
   CPDF_Object* pAttr = GetAttr(owner, name, bInheritable, subindex);
   return ToNumber(pAttr) ? pAttr->GetInteger() : default_value;
 }