Remove IFX_SeekableWriteStream::WriteBlock()
Remove this method, along with the pure virtual AppendBlock(). Rename
AppendBlock() overrides in subclasses to WriteBlock(). They are
effectively the same thing.
Change-Id: I6f5b19599a2f7cc7321b5024d5411a29730dadec
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/123491
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Tom Sepez <tsepez@google.com>
diff --git a/core/fpdfapi/parser/cpdf_seekablemultistream.cpp b/core/fpdfapi/parser/cpdf_seekablemultistream.cpp
index 7700834..d14fa73 100644
--- a/core/fpdfapi/parser/cpdf_seekablemultistream.cpp
+++ b/core/fpdfapi/parser/cpdf_seekablemultistream.cpp
@@ -75,6 +75,6 @@
NOTREACHED_NORETURN();
}
-bool CPDF_SeekableMultiStream::AppendBlock(pdfium::span<const uint8_t> buffer) {
+bool CPDF_SeekableMultiStream::WriteBlock(pdfium::span<const uint8_t> buffer) {
NOTREACHED_NORETURN();
}
diff --git a/core/fpdfapi/parser/cpdf_seekablemultistream.h b/core/fpdfapi/parser/cpdf_seekablemultistream.h
index c227df9..3c00888 100644
--- a/core/fpdfapi/parser/cpdf_seekablemultistream.h
+++ b/core/fpdfapi/parser/cpdf_seekablemultistream.h
@@ -21,14 +21,14 @@
std::vector<RetainPtr<const CPDF_Stream>> streams);
~CPDF_SeekableMultiStream() override;
- // IFX_SeekableReadStream:
+ // IFX_SeekableStream:
FX_FILESIZE GetPosition() override;
FX_FILESIZE GetSize() override;
bool IsEOF() override;
size_t ReadBlock(pdfium::span<uint8_t> buffer) override;
bool ReadBlockAtOffset(pdfium::span<uint8_t> buffer,
FX_FILESIZE offset) override;
- bool AppendBlock(pdfium::span<const uint8_t> buffer) override;
+ bool WriteBlock(pdfium::span<const uint8_t> buffer) override;
bool Flush() override;
private:
diff --git a/core/fxcrt/cfx_memorystream.cpp b/core/fxcrt/cfx_memorystream.cpp
index 2933902..90bdb26 100644
--- a/core/fxcrt/cfx_memorystream.cpp
+++ b/core/fxcrt/cfx_memorystream.cpp
@@ -67,7 +67,7 @@
return nRead;
}
-bool CFX_MemoryStream::AppendBlock(pdfium::span<const uint8_t> buffer) {
+bool CFX_MemoryStream::WriteBlock(pdfium::span<const uint8_t> buffer) {
if (buffer.empty())
return true;
diff --git a/core/fxcrt/cfx_memorystream.h b/core/fxcrt/cfx_memorystream.h
index fcced54..1402f88 100644
--- a/core/fxcrt/cfx_memorystream.h
+++ b/core/fxcrt/cfx_memorystream.h
@@ -23,7 +23,7 @@
size_t ReadBlock(pdfium::span<uint8_t> buffer) override;
bool ReadBlockAtOffset(pdfium::span<uint8_t> buffer,
FX_FILESIZE offset) override;
- bool AppendBlock(pdfium::span<const uint8_t> buffer) override;
+ bool WriteBlock(pdfium::span<const uint8_t> buffer) override;
bool Flush() override;
pdfium::span<const uint8_t> GetSpan() const;
diff --git a/core/fxcrt/cfx_memorystream_unittest.cpp b/core/fxcrt/cfx_memorystream_unittest.cpp
index 6ce47cc..5be3323 100644
--- a/core/fxcrt/cfx_memorystream_unittest.cpp
+++ b/core/fxcrt/cfx_memorystream_unittest.cpp
@@ -29,20 +29,20 @@
ASSERT_THAT(buffer, testing::ElementsAre('d', 'e', 'f'));
}
-TEST(CFXMemoryStreamTest, AppendBlock) {
+TEST(CFXMemoryStreamTest, WriteBlock) {
auto stream = pdfium::MakeRetain<CFX_MemoryStream>();
- ASSERT_TRUE(stream->AppendBlock({}));
+ ASSERT_TRUE(stream->WriteBlock({}));
ASSERT_TRUE(stream->GetSpan().empty());
const uint8_t kData1[] = {'a', 'b', 'c'};
ASSERT_TRUE(stream->WriteBlock(kData1));
ASSERT_THAT(stream->GetSpan(), testing::ElementsAre('a', 'b', 'c'));
- ASSERT_TRUE(stream->AppendBlock(kData1));
+ ASSERT_TRUE(stream->WriteBlock(kData1));
ASSERT_THAT(stream->GetSpan(),
testing::ElementsAre('a', 'b', 'c', 'a', 'b', 'c'));
- ASSERT_TRUE(stream->AppendBlock({}));
+ ASSERT_TRUE(stream->WriteBlock({}));
ASSERT_THAT(stream->GetSpan(),
testing::ElementsAre('a', 'b', 'c', 'a', 'b', 'c'));
}
diff --git a/core/fxcrt/fx_stream.cpp b/core/fxcrt/fx_stream.cpp
index 775e6e0..d6494dc 100644
--- a/core/fxcrt/fx_stream.cpp
+++ b/core/fxcrt/fx_stream.cpp
@@ -28,7 +28,7 @@
size_t ReadBlock(pdfium::span<uint8_t> buffer) override {
return m_pFile->Read(buffer);
}
- bool AppendBlock(pdfium::span<const uint8_t> buffer) override {
+ bool WriteBlock(pdfium::span<const uint8_t> buffer) override {
return !!m_pFile->WritePos(buffer, GetSize());
}
bool Flush() override { return m_pFile->Flush(); }
@@ -73,10 +73,6 @@
return pdfium::MakeRetain<CFX_CRTFileStream>(std::move(pFA));
}
-bool IFX_SeekableWriteStream::WriteBlock(pdfium::span<const uint8_t> buffer) {
- return AppendBlock(buffer);
-}
-
bool IFX_SeekableReadStream::IsEOF() {
return false;
}
@@ -88,7 +84,3 @@
size_t IFX_SeekableReadStream::ReadBlock(pdfium::span<uint8_t> buffer) {
return 0;
}
-
-bool IFX_SeekableStream::WriteBlock(pdfium::span<const uint8_t> buffer) {
- return AppendBlock(buffer);
-}
diff --git a/core/fxcrt/fx_stream.h b/core/fxcrt/fx_stream.h
index c1430bb..3e3bf7c 100644
--- a/core/fxcrt/fx_stream.h
+++ b/core/fxcrt/fx_stream.h
@@ -45,11 +45,7 @@
class IFX_SeekableWriteStream : virtual public IFX_StreamWithSize,
public IFX_RetainableWriteStream {
public:
- // IFX_WriteStream:
- bool WriteBlock(pdfium::span<const uint8_t> buffer) override;
-
virtual bool Flush() = 0;
- virtual bool AppendBlock(pdfium::span<const uint8_t> buffer) = 0;
};
class IFX_SeekableReadStream : virtual public Retainable,
@@ -67,9 +63,6 @@
class IFX_SeekableStream : public IFX_SeekableReadStream,
public IFX_SeekableWriteStream {
- public:
- // IFX_SeekableWriteStream:
- bool WriteBlock(pdfium::span<const uint8_t> buffer) override;
};
#endif // CORE_FXCRT_FX_STREAM_H_
diff --git a/fpdfsdk/cpdfsdk_helpers.cpp b/fpdfsdk/cpdfsdk_helpers.cpp
index e63860a..07a7d79 100644
--- a/fpdfsdk/cpdfsdk_helpers.cpp
+++ b/fpdfsdk/cpdfsdk_helpers.cpp
@@ -102,7 +102,7 @@
size_t ReadBlock(pdfium::span<uint8_t> buffer) override;
bool ReadBlockAtOffset(pdfium::span<uint8_t> buffer,
FX_FILESIZE offset) override;
- bool AppendBlock(pdfium::span<const uint8_t> buffer) override;
+ bool WriteBlock(pdfium::span<const uint8_t> buffer) override;
bool Flush() override;
void SetPosition(FX_FILESIZE pos) { m_nCurPos = pos; }
@@ -171,7 +171,7 @@
return 0;
}
-bool FPDF_FileHandlerContext::AppendBlock(pdfium::span<const uint8_t> buffer) {
+bool FPDF_FileHandlerContext::WriteBlock(pdfium::span<const uint8_t> buffer) {
if (!m_pFS || !m_pFS->WriteBlock) {
return false;
}
