From 9d6a2089c93c94461289b21a29771039eace95e7 Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Wed, 12 Apr 2017 11:32:32 -0400
Subject: Remove MakeSeekableReadStream
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This Cl removes the MakeSeekableReadStream call and, at the one place
it's used, creates an IFX_MemoryStream which is a seekable read stream.

Change-Id: I6b0b23636eff47f8caca5432313ba99703e21e4d
Reviewed-on: https://pdfium-review.googlesource.com/4037
Reviewed-by: Nicolás Peña <npm@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
---
 xfa/fxfa/cxfa_ffapp.cpp | 66 -------------------------------------------------
 1 file changed, 66 deletions(-)

(limited to 'xfa/fxfa/cxfa_ffapp.cpp')

diff --git a/xfa/fxfa/cxfa_ffapp.cpp b/xfa/fxfa/cxfa_ffapp.cpp
index 7b88626c91..c02fd30e86 100644
--- a/xfa/fxfa/cxfa_ffapp.cpp
+++ b/xfa/fxfa/cxfa_ffapp.cpp
@@ -23,72 +23,6 @@
 #include "xfa/fxfa/cxfa_ffwidgethandler.h"
 #include "xfa/fxfa/cxfa_fontmgr.h"
 
-namespace {
-
-class CXFA_FileRead : public IFX_SeekableReadStream {
- public:
-  explicit CXFA_FileRead(const std::vector<CPDF_Stream*>& streams);
-  ~CXFA_FileRead() override;
-
-  // IFX_SeekableReadStream
-  FX_FILESIZE GetSize() override;
-  bool ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override;
-
- private:
-  std::vector<CFX_RetainPtr<CPDF_StreamAcc>> m_Data;
-};
-
-CXFA_FileRead::CXFA_FileRead(const std::vector<CPDF_Stream*>& streams) {
-  for (CPDF_Stream* pStream : streams) {
-    m_Data.push_back(pdfium::MakeRetain<CPDF_StreamAcc>(pStream));
-    m_Data.back()->LoadAllData();
-  }
-}
-
-CXFA_FileRead::~CXFA_FileRead() {}
-
-FX_FILESIZE CXFA_FileRead::GetSize() {
-  uint32_t dwSize = 0;
-  for (const auto& acc : m_Data)
-    dwSize += acc->GetSize();
-  return dwSize;
-}
-
-bool CXFA_FileRead::ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) {
-  int32_t iCount = pdfium::CollectionSize<int32_t>(m_Data);
-  int32_t index = 0;
-  while (index < iCount) {
-    const auto& acc = m_Data[index];
-    FX_FILESIZE dwSize = acc->GetSize();
-    if (offset < dwSize)
-      break;
-
-    offset -= dwSize;
-    index++;
-  }
-  while (index < iCount) {
-    const auto& acc = m_Data[index];
-    uint32_t dwSize = acc->GetSize();
-    size_t dwRead = std::min(size, static_cast<size_t>(dwSize - offset));
-    memcpy(buffer, acc->GetData() + offset, dwRead);
-    size -= dwRead;
-    if (size == 0)
-      return true;
-
-    buffer = (uint8_t*)buffer + dwRead;
-    offset = 0;
-    index++;
-  }
-  return false;
-}
-
-}  // namespace
-
-CFX_RetainPtr<IFX_SeekableReadStream> MakeSeekableReadStream(
-    const std::vector<CPDF_Stream*>& streams) {
-  return CFX_RetainPtr<IFX_SeekableReadStream>(new CXFA_FileRead(streams));
-}
-
 CXFA_FFApp::CXFA_FFApp(IXFA_AppProvider* pProvider)
     : m_pProvider(pProvider),
       m_pWidgetMgrDelegate(nullptr),
-- 
cgit v1.2.3