Make CPDF_Object subclass constructors intern strings

core/fpdfapi/parser/cpdf_indirect_object_holder.h

Index: core/fpdfapi/parser/cpdf_indirect_object_holder.h
diff --git a/core/fpdfapi/parser/cpdf_indirect_object_holder.h b/core/fpdfapi/parser/cpdf_indirect_object_holder.h
index 375010de93ea9b5c57b4f1bf16142b4d4ec97f5b..1adffe6f54d1d11f7a9dd8bd4c91f18f217f1ac8 100644
--- a/core/fpdfapi/parser/cpdf_indirect_object_holder.h
+++ b/core/fpdfapi/parser/cpdf_indirect_object_holder.h
@@ -9,6 +9,7 @@
 
 #include <map>
 #include <memory>
+#include <type_traits>
 
 #include "core/fxcrt/cfx_string_pool_template.h"
 #include "core/fxcrt/cfx_weak_ptr.h"
@@ -16,6 +17,7 @@
 #include "third_party/base/ptr_util.h"
 
 class CPDF_Object;
+class CPDF_Name;
 
 class CPDF_IndirectObjectHolder {
  public:
@@ -30,12 +32,21 @@ class CPDF_IndirectObjectHolder {
   void DeleteIndirectObject(uint32_t objnum);
 
   // Creates and adds a new object owned by the indirect object holder,
-  // and returns an unowned pointer to it.
+  // and returns an unowned pointer to it.  We have a special case to
+  // handle objects that can intern strings from our ByteStringPool.
   template <typename T, typename... Args>
-  T* NewIndirect(Args... args) {
+  typename std::enable_if<!std::is_same<T, CPDF_Name>::value, T*>::type
+      NewIndirect(Args... args) {
     return static_cast<T*>(AddIndirectObject(pdfium::MakeUnique<T>(args...)));
   }
 
+  template <typename T, typename... Args>
+  typename std::enable_if<std::is_same<T, CPDF_Name>::value, T*>::type
+      NewIndirect(Args... args) {
+    return static_cast<T*>(
+        AddIndirectObject(pdfium::MakeUnique<T>(m_pByteStringPool, args...)));

[Tom Sepez, 2016/11/16 22:36:36]

Here, the indirect object holder injects its own bytestringpool into the ctor
call, transparently to the callers if the type is expected to take it.

+  }
+
   // Takes ownership of |pObj|, returns unowned pointer to it.
   CPDF_Object* AddIndirectObject(std::unique_ptr<CPDF_Object> pObj);