Store the offset in the archive buffer

This Cl moves the implementation of the archive buffer behind an
IFX_ArchiveStream interface. The buffer holds the current offset and the
offset parameter is removed from the CPDF_Creator and various other
methods.

Change-Id: Ia54e803b58bbfb6ef03fec4a940d2c056d541356
Reviewed-on: https://pdfium-review.googlesource.com/5255
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

1 files changed, 9 insertions, 19 deletions

diff --git a/core/fpdfapi/parser/cpdf_array.cpp b/core/fpdfapi/parser/cpdf_array.cpp
index aa10588f87..698cd6d0d0 100644
--- a/core/fpdfapi/parser/cpdf_array.cpp
+++ b/core/fpdfapi/parser/cpdf_array.cpp
@@ -194,31 +194,21 @@ CPDF_Object* CPDF_Array::Add(std::unique_ptr<CPDF_Object> pObj) {
   return pRet;
 }
 
-bool CPDF_Array::WriteTo(CFX_FileBufferArchive* archive,
-                         FX_FILESIZE* offset) const {
-  if (archive->AppendString("[") < 0)
+bool CPDF_Array::WriteTo(IFX_ArchiveStream* archive) const {
+  if (!archive->WriteString("["))
     return false;
-  *offset += 1;
 
   for (size_t i = 0; i < GetCount(); ++i) {
     CPDF_Object* pElement = GetObjectAt(i);
     if (!pElement->IsInline()) {
-      if (archive->AppendString(" ") < 0)
-        return false;
-
-      int32_t len = archive->AppendDWord(pElement->GetObjNum());
-      if (len < 0)
-        return false;
-      if (archive->AppendString(" 0 R") < 0)
-        return false;
-      *offset += len + 5;
-    } else {
-      if (!pElement->WriteTo(archive, offset))
+      if (!archive->WriteString(" ") ||
+          !archive->WriteDWord(pElement->GetObjNum()) ||
+          !archive->WriteString(" 0 R")) {
         return false;
+      }
+    } else if (!pElement->WriteTo(archive)) {
+      return false;
     }
   }
-  if (archive->AppendString("]") < 0)
-    return false;
-  *offset += 1;
-  return true;
+  return archive->WriteString("]");
 }