3 files changed, 52 insertions, 45 deletions
diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp
index 638c22be26..b0e0ec7cc3 100644
--- a/fpdfsdk/fpdfsave.cpp
+++ b/fpdfsdk/fpdfsave.cpp
@@ -19,6 +19,7 @@
 #include "core/fxcrt/cfx_memorystream.h"
 #include "core/fxcrt/fx_extension.h"
 #include "fpdfsdk/fsdk_define.h"
+#include "fpdfsdk/fsdk_filewriteadapter.h"
 #include "public/fpdf_edit.h"
 
 #ifdef PDF_ENABLE_XFA
@@ -39,45 +40,6 @@
 #include <ctime>
 #endif
 
-class CFX_IFileWrite final : public IFX_WriteStream {
- public:
-  static CFX_RetainPtr<CFX_IFileWrite> Create();
-
-  bool Init(FPDF_FILEWRITE* pFileWriteStruct);
-  bool WriteBlock(const void* pData, size_t size) override;
-
- protected:
-  template <typename T, typename... Args>
-  friend CFX_RetainPtr<T> pdfium::MakeRetain(Args&&... args);
-
-  CFX_IFileWrite();
-  ~CFX_IFileWrite() override {}
-
-  FPDF_FILEWRITE* m_pFileWriteStruct;
-};
-
-CFX_RetainPtr<CFX_IFileWrite> CFX_IFileWrite::Create() {
-  return pdfium::MakeRetain<CFX_IFileWrite>();
-}
-
-CFX_IFileWrite::CFX_IFileWrite() : m_pFileWriteStruct(nullptr) {}
-
-bool CFX_IFileWrite::Init(FPDF_FILEWRITE* pFileWriteStruct) {
-  if (!pFileWriteStruct)
-    return false;
-
-  m_pFileWriteStruct = pFileWriteStruct;
-  return true;
-}
-
-bool CFX_IFileWrite::WriteBlock(const void* pData, size_t size) {
-  if (!m_pFileWriteStruct)
-    return false;
-
-  m_pFileWriteStruct->WriteBlock(m_pFileWriteStruct, pData, size);
-  return true;
-}
-
 namespace {
 
 #ifdef PDF_ENABLE_XFA
@@ -294,17 +256,16 @@ bool FPDF_Doc_Save(FPDF_DOCUMENT document,
   if (flags < FPDF_INCREMENTAL || flags > FPDF_REMOVE_SECURITY)
     flags = 0;
 
-  CPDF_Creator FileMaker(pPDFDoc);
+  CPDF_Creator fileMaker(pPDFDoc,
+                         pdfium::MakeRetain<FSDK_FileWriteAdapter>(pFileWrite));
   if (bSetVersion)
-    FileMaker.SetFileVersion(fileVerion);
+    fileMaker.SetFileVersion(fileVerion);
   if (flags == FPDF_REMOVE_SECURITY) {
     flags = 0;
-    FileMaker.RemoveSecurity();
+    fileMaker.RemoveSecurity();
   }
 
-  CFX_RetainPtr<CFX_IFileWrite> pStreamWrite = CFX_IFileWrite::Create();
-  pStreamWrite->Init(pFileWrite);
-  bool bRet = FileMaker.Create(pStreamWrite, flags);
+  bool bRet = fileMaker.Create(flags);
 #ifdef PDF_ENABLE_XFA
   SendPostSaveToXFADoc(pContext);
 #endif  // PDF_ENABLE_XFA
diff --git a/fpdfsdk/fsdk_filewriteadapter.cpp b/fpdfsdk/fsdk_filewriteadapter.cpp
new file mode 100644
index 0000000000..98ca3af574
--- /dev/null
+++ b/fpdfsdk/fsdk_filewriteadapter.cpp
@@ -0,0 +1,18 @@
+// Copyright 2017 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 "fpdfsdk/fsdk_filewriteadapter.h"
+
+FSDK_FileWriteAdapter::FSDK_FileWriteAdapter(FPDF_FILEWRITE* fileWriteStruct)
+    : fileWriteStruct_(fileWriteStruct) {
+  ASSERT(fileWriteStruct_);
+}
+
+FSDK_FileWriteAdapter::~FSDK_FileWriteAdapter() {}
+
+bool FSDK_FileWriteAdapter::WriteBlock(const void* data, size_t size) {
+  return fileWriteStruct_->WriteBlock(fileWriteStruct_, data, size) != 0;
+}
diff --git a/fpdfsdk/fsdk_filewriteadapter.h b/fpdfsdk/fsdk_filewriteadapter.h
new file mode 100644
index 0000000000..78f34cc679
--- /dev/null
+++ b/fpdfsdk/fsdk_filewriteadapter.h
@@ -0,0 +1,28 @@
+// Copyright 2017 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 FPDFSDK_FSDK_FILEWRITEADAPTER_H_
+#define FPDFSDK_FSDK_FILEWRITEADAPTER_H_
+
+#include "core/fxcrt/cfx_retain_ptr.h"
+#include "core/fxcrt/fx_stream.h"
+#include "public/fpdf_save.h"
+
+class FSDK_FileWriteAdapter : public IFX_WriteStream {
+ public:
+  template <typename T, typename... Args>
+  friend CFX_RetainPtr<T> pdfium::MakeRetain(Args&&... args);
+
+  bool WriteBlock(const void* data, size_t size) override;
+
+ private:
+  explicit FSDK_FileWriteAdapter(FPDF_FILEWRITE* fileWriteStruct);
+  ~FSDK_FileWriteAdapter() override;
+
+  FPDF_FILEWRITE* fileWriteStruct_;
+};
+
+#endif  // FPDFSDK_FSDK_FILEWRITEADAPTER_H_