Make CPDF_Object subclass constructors intern strings

core/fpdfapi/parser/cpdf_array.h

 // Copyright 2016 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
 
 #ifndef CORE_FPDFAPI_PARSER_CPDF_ARRAY_H_
 #define CORE_FPDFAPI_PARSER_CPDF_ARRAY_H_
 
 #include <memory>
 #include <set>
+#include <type_traits>
 #include <vector>
 
 #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h"
 #include "core/fpdfapi/parser/cpdf_object.h"
 #include "core/fxcrt/fx_basic.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "third_party/base/ptr_util.h"
 
 class CPDF_Array : public CPDF_Object {
  public:
@@ skipping 23 matching lines @@
   FX_FLOAT GetFloatAt(size_t index) const { return GetNumberAt(index); }
   CFX_Matrix GetMatrix();
   CFX_FloatRect GetRect();
 
   // Takes ownership of |pObj|, returns unowned pointer to it.
   CPDF_Object* Add(std::unique_ptr<CPDF_Object> pObj);
   CPDF_Object* SetAt(size_t index, std::unique_ptr<CPDF_Object> pObj);
   CPDF_Object* InsertAt(size_t index, std::unique_ptr<CPDF_Object> pObj);
 
   // Creates object owned by the array, returns unowned pointer to it.
+  // We have special cases for objects that can intern strings from
+  // a ByteStringPool.
   template <typename T, typename... Args>
-  T* AddNew(Args... args) {
+  typename std::enable_if<!std::is_same<T, CPDF_Name>::value, T*>::type AddNew(

[Tom Sepez, 2016/11/16 22:35:47]

note: the return value type is nonsense if T is CPDF_Name, so it is silently
skipped for it. Otherwise the return type becomes T* as usual.

+      Args... args) {
     return static_cast<T*>(Add(pdfium::MakeUnique<T>(args...)));
   }
   template <typename T, typename... Args>
-  T* SetNewAt(size_t index, Args... args) {
+  typename std::enable_if<std::is_same<T, CPDF_Name>::value, T*>::type AddNew(

[Tom Sepez, 2016/11/16 22:35:47]

Exact opposite.  Inject a nullptr argument for the pool, subsequently arrays
will track actual pools in a follow-up CL.

+      Args... args) {
+    return static_cast<T*>(Add(pdfium::MakeUnique<T>(nullptr, args...)));
+  }
+  template <typename T, typename... Args>
+  typename std::enable_if<!std::is_same<T, CPDF_Name>::value, T*>::type
+  SetNewAt(size_t index, Args... args) {
     return static_cast<T*>(SetAt(index, pdfium::MakeUnique<T>(args...)));
   }
   template <typename T, typename... Args>
-  T* InsertNewAt(size_t index, Args... args) {
+  typename std::enable_if<std::is_same<T, CPDF_Name>::value, T*>::type SetNewAt(
+      size_t index,
+      Args... args) {
+    return static_cast<T*>(
+        SetAt(index, pdfium::MakeUnique<T>(nullptr, args...)));
+  }
+  template <typename T, typename... Args>
+  typename std::enable_if<!std::is_same<T, CPDF_Name>::value, T*>::type
+  InsertNewAt(size_t index, Args... args) {
     return static_cast<T*>(InsertAt(index, pdfium::MakeUnique<T>(args...)));
   }
+  template <typename T, typename... Args>
+  typename std::enable_if<std::is_same<T, CPDF_Name>::value, T*>::type
+  InsertNewAt(size_t index, Args... args) {
+    return static_cast<T*>(
+        InsertAt(index, pdfium::MakeUnique<T>(nullptr, args...)));
+  }
 
   void RemoveAt(size_t index, size_t nCount = 1);
   void ConvertToIndirectObjectAt(size_t index, CPDF_IndirectObjectHolder* pDoc);
 
   const_iterator begin() const { return m_Objects.begin(); }
   const_iterator end() const { return m_Objects.end(); }
 
  protected:
   std::unique_ptr<CPDF_Object> CloneNonCyclic(
       bool bDirect,
@@ skipping 12 matching lines @@
 
 inline std::unique_ptr<CPDF_Array> ToArray(std::unique_ptr<CPDF_Object> obj) {
   CPDF_Array* pArray = ToArray(obj.get());
   if (!pArray)
     return nullptr;
   obj.release();
   return std::unique_ptr<CPDF_Array>(pArray);
 }
 
 #endif  // CORE_FPDFAPI_PARSER_CPDF_ARRAY_H_