Move fxcrt_stream code to fx_stream file

This Cl consolidates the stream code into fx_stream.

Change-Id: I22a250b4ca6e342592b81260d2a918ebab7f60a2
Reviewed-on: https://pdfium-review.googlesource.com/4373
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>

3 files changed, 20 insertions, 28 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 2f8123798e..135cbfbf80 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -786,7 +786,6 @@ static_library("fxcrt") {
     "core/fxcrt/fx_unicode.cpp",
     "core/fxcrt/fxcrt_posix.cpp",
     "core/fxcrt/fxcrt_posix.h",
-    "core/fxcrt/fxcrt_stream.cpp",
     "core/fxcrt/fxcrt_windows.cpp",
     "core/fxcrt/fxcrt_windows.h",
     "core/fxcrt/ifxcrt_fileaccess.h",
diff --git a/core/fxcrt/fx_stream.cpp b/core/fxcrt/fx_stream.cpp
index c60a546ddd..a0086f269e 100644
--- a/core/fxcrt/fx_stream.cpp
+++ b/core/fxcrt/fx_stream.cpp
@@ -305,3 +305,23 @@ CFX_RetainPtr<IFX_MemoryStream> IFX_MemoryStream::Create(uint8_t* pBuffer,
 CFX_RetainPtr<IFX_MemoryStream> IFX_MemoryStream::Create(bool bConsecutive) {
   return pdfium::MakeRetain<CFX_MemoryStream>(bConsecutive);
 }
+
+bool IFX_SeekableWriteStream::WriteBlock(const void* pData, size_t size) {
+  return WriteBlock(pData, GetSize(), size);
+}
+
+bool IFX_SeekableReadStream::IsEOF() {
+  return false;
+}
+
+FX_FILESIZE IFX_SeekableReadStream::GetPosition() {
+  return 0;
+}
+
+size_t IFX_SeekableReadStream::ReadBlock(void* buffer, size_t size) {
+  return 0;
+}
+
+bool IFX_SeekableStream::WriteBlock(const void* buffer, size_t size) {
+  return WriteBlock(buffer, GetSize(), size);
+}
diff --git a/core/fxcrt/fxcrt_stream.cpp b/core/fxcrt/fxcrt_stream.cpp
deleted file mode 100644
index 3afe6323b2..0000000000
--- a/core/fxcrt/fxcrt_stream.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// 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
-
-#include "core/fxcrt/fx_stream.h"
-
-bool IFX_SeekableWriteStream::WriteBlock(const void* pData, size_t size) {
-  return WriteBlock(pData, GetSize(), size);
-}
-
-bool IFX_SeekableReadStream::IsEOF() {
-  return false;
-}
-
-FX_FILESIZE IFX_SeekableReadStream::GetPosition() {
-  return 0;
-}
-
-size_t IFX_SeekableReadStream::ReadBlock(void* buffer, size_t size) {
-  return 0;
-}
-
-bool IFX_SeekableStream::WriteBlock(const void* buffer, size_t size) {
-  return WriteBlock(buffer, GetSize(), size);
-}