diff options
| author | Henrique Nakashima <hnakashima@chromium.org> | 2018-07-06 17:28:46 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-07-06 17:28:46 +0000 |
| commit | dd1083b47c029d2540aceb246bf80f549781f62f (patch) | |
| tree | 7e67b3daeb837eb50c5d72e99cf067538ce7df2c /testing | |
| parent | e3c4b205572eff5f12900f87d612f14a460e4997 (diff) | |
| download | pdfium-dd1083b47c029d2540aceb246bf80f549781f62f.tar.xz | |
Revert "Avoid duplicate data buffering in CPDF_SyntaxParser::ReadStream()."
This reverts commit 77f15f7883638a4ced131d74c053af10a5970ce9.
Reason for revert: Causes crbug.com/860210
Bug: chromium:860210
Original change's description:
> Avoid duplicate data buffering in CPDF_SyntaxParser::ReadStream().
>
> Allow sub-streams created from an IFX_SeekableReadStream to provide
> stream data without copying memory.
> The data will only reside in the top-level stream.
>
> For example:
> For file
> http://www.major-landrover.ru/upload/attachments/f/9/f96aab07dab04ae89c8a509ec1ef2b31.pdf
> (18 Mb)
>
> The memory usage is reduced by ~13 Mb.
>
> Change-Id: I2595c014d0fbe1fdd181cc04965cfd7d901c2d88
> Reviewed-on: https://pdfium-review.googlesource.com/35930
> Commit-Queue: Art Snake <art-snake@yandex-team.ru>
> Reviewed-by: dsinclair <dsinclair@chromium.org>
TBR=tsepez@chromium.org,dsinclair@chromium.org,art-snake@yandex-team.ru
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: I947fca17052765935a952a4f25ca48f6599c4af9
Reviewed-on: https://pdfium-review.googlesource.com/37210
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/embedder_test.cpp | 4 | ||||
| -rw-r--r-- | testing/embedder_test.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp index e874640218..e4ac4ad2c7 100644 --- a/testing/embedder_test.cpp +++ b/testing/embedder_test.cpp @@ -351,9 +351,7 @@ FPDF_DOCUMENT EmbedderTest::OpenSavedDocument(const char* password) { memset(&saved_file_access_, 0, sizeof(saved_file_access_)); saved_file_access_.m_FileLen = data_string_.size(); saved_file_access_.m_GetBlock = GetBlockFromString; - // Copy data to prevent clearing it before saved document close. - saved_document_file_data_ = data_string_; - saved_file_access_.m_Param = &saved_document_file_data_; + saved_file_access_.m_Param = &data_string_; saved_fake_file_access_ = pdfium::MakeUnique<FakeFileAccess>(&saved_file_access_); diff --git a/testing/embedder_test.h b/testing/embedder_test.h index b0dada0341..e8f76c058f 100644 --- a/testing/embedder_test.h +++ b/testing/embedder_test.h @@ -260,7 +260,6 @@ class EmbedderTest : public ::testing::Test, int GetPageNumberForSavedPage(FPDF_PAGE page) const; std::string data_string_; - std::string saved_document_file_data_; std::ofstream filestream_; }; |