forked from chromium/chromium
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert of Improve linearized pdf load/show time. (patchset #18 id:340…
…001 of https://codereview.chromium.org/2349753003/ ) Reason for revert: https://build.chromium.org/p/chromium/builders/Win%20x64/builds/5423/steps/compile/logs/stdio FAILED: obj/pdf/pdf_unittests/document_loader_unittest.obj pdf\document_loader_unittest.cc(631): error C2131: expression did not evaluate to a constant pdf\document_loader_unittest.cc(631): note: failure was caused by call of undefined function or one not declared 'constexpr' pdf\document_loader_unittest.cc(631): note: see usage of 'chrome_pdf::DocumentLoader::default_request_size' Original issue's description: > Improve linearized pdf load/show time. > Reduce Pdf Plugin's count of reconnects. > Add tests for PDFPlugin DocumentLoader. > > DocumentLoader was splitted into separate components, and missing tests was added for them. > > The main ideas in this CL are: > > 1) Do not reset browser initiated connection at start (includes case when we can use range requests), if we request data near current downloading position. > 2) Request as much data as we can on each request, and continue loading data using current range request. (like tape rewind) > 3) Isolate RangeRequest logic into DocumentLoader. Method OnPendingRequestComplete is called, when we receive requested data (main connection, or Range connection). (like tape playing without rewing). > 4) Fill this logic by tests. > > Example URL: > http://www.major-landrover.ru/upload/attachments/f/9/f96aab07dab04ae89c8a509ec1ef2b31.pdf > Comparison of changes: > https://drive.google.com/file/d/0BzWfMBOuik2QNGg0SG93Y3lpUlE/view?usp=sharing > > Committed: https://crrev.com/7fd7423cdee0dba84faf480d10dd66dcb57110d9 > Cr-Commit-Position: refs/heads/master@{#427752} TBR=jochen@chromium.org,raymes@chromium.org,spelchat@chromium.org,rsesek@chromium.org,art-snake@yandex-team.ru # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review-Url: https://codereview.chromium.org/2458493002 Cr-Commit-Position: refs/heads/master@{#427772}
- Loading branch information
Showing
24 changed files
with
742 additions
and
2,985 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,175 @@ | ||
| // Copyright (c) 2010 The Chromium Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #include "pdf/chunk_stream.h" | ||
|
|
||
| #include <stddef.h> | ||
| #include <string.h> | ||
|
|
||
| #define __STDC_LIMIT_MACROS | ||
| #ifdef _WIN32 | ||
| #include <limits.h> | ||
| #else | ||
| #include <stdint.h> | ||
| #endif | ||
|
|
||
| #include <algorithm> | ||
|
|
||
| namespace chrome_pdf { | ||
|
|
||
| ChunkStream::ChunkStream() : stream_size_(0) { | ||
| } | ||
|
|
||
| ChunkStream::~ChunkStream() { | ||
| } | ||
|
|
||
| void ChunkStream::Clear() { | ||
| chunks_.clear(); | ||
| data_.clear(); | ||
| stream_size_ = 0; | ||
| } | ||
|
|
||
| void ChunkStream::Preallocate(size_t stream_size) { | ||
| data_.reserve(stream_size); | ||
| stream_size_ = stream_size; | ||
| } | ||
|
|
||
| size_t ChunkStream::GetSize() const { | ||
| return data_.size(); | ||
| } | ||
|
|
||
| bool ChunkStream::WriteData(size_t offset, void* buffer, size_t size) { | ||
| if (SIZE_MAX - size < offset) | ||
| return false; | ||
|
|
||
| if (data_.size() < offset + size) | ||
| data_.resize(offset + size); | ||
|
|
||
| memcpy(&data_[offset], buffer, size); | ||
|
|
||
| if (chunks_.empty()) { | ||
| chunks_[offset] = size; | ||
| return true; | ||
| } | ||
|
|
||
| std::map<size_t, size_t>::iterator start = chunks_.upper_bound(offset); | ||
| if (start != chunks_.begin()) | ||
| --start; // start now points to the key equal or lower than offset. | ||
| if (start->first + start->second < offset) | ||
| ++start; // start element is entirely before current chunk, skip it. | ||
|
|
||
| std::map<size_t, size_t>::iterator end = chunks_.upper_bound(offset + size); | ||
| if (start == end) { // No chunks to merge. | ||
| chunks_[offset] = size; | ||
| return true; | ||
| } | ||
|
|
||
| --end; | ||
|
|
||
| size_t new_offset = std::min<size_t>(start->first, offset); | ||
| size_t new_size = | ||
| std::max<size_t>(end->first + end->second, offset + size) - new_offset; | ||
|
|
||
| chunks_.erase(start, ++end); | ||
|
|
||
| chunks_[new_offset] = new_size; | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| bool ChunkStream::ReadData(size_t offset, size_t size, void* buffer) const { | ||
| if (!IsRangeAvailable(offset, size)) | ||
| return false; | ||
|
|
||
| memcpy(buffer, &data_[offset], size); | ||
| return true; | ||
| } | ||
|
|
||
| bool ChunkStream::GetMissedRanges( | ||
| size_t offset, size_t size, | ||
| std::vector<std::pair<size_t, size_t> >* ranges) const { | ||
| if (IsRangeAvailable(offset, size)) | ||
| return false; | ||
|
|
||
| ranges->clear(); | ||
| if (chunks_.empty()) { | ||
| ranges->push_back(std::pair<size_t, size_t>(offset, size)); | ||
| return true; | ||
| } | ||
|
|
||
| std::map<size_t, size_t>::const_iterator start = chunks_.upper_bound(offset); | ||
| if (start != chunks_.begin()) | ||
| --start; // start now points to the key equal or lower than offset. | ||
| if (start->first + start->second < offset) | ||
| ++start; // start element is entirely before current chunk, skip it. | ||
|
|
||
| std::map<size_t, size_t>::const_iterator end = | ||
| chunks_.upper_bound(offset + size); | ||
| if (start == end) { // No data in the current range available. | ||
| ranges->push_back(std::pair<size_t, size_t>(offset, size)); | ||
| return true; | ||
| } | ||
|
|
||
| size_t cur_offset = offset; | ||
| std::map<size_t, size_t>::const_iterator it; | ||
| for (it = start; it != end; ++it) { | ||
| if (cur_offset < it->first) { | ||
| size_t new_size = it->first - cur_offset; | ||
| ranges->push_back(std::pair<size_t, size_t>(cur_offset, new_size)); | ||
| cur_offset = it->first + it->second; | ||
| } else if (cur_offset < it->first + it->second) { | ||
| cur_offset = it->first + it->second; | ||
| } | ||
| } | ||
|
|
||
| // Add last chunk. | ||
| if (cur_offset < offset + size) | ||
| ranges->push_back(std::pair<size_t, size_t>(cur_offset, | ||
| offset + size - cur_offset)); | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| bool ChunkStream::IsRangeAvailable(size_t offset, size_t size) const { | ||
| if (chunks_.empty()) | ||
| return false; | ||
|
|
||
| if (SIZE_MAX - size < offset) | ||
| return false; | ||
|
|
||
| std::map<size_t, size_t>::const_iterator it = chunks_.upper_bound(offset); | ||
| if (it == chunks_.begin()) | ||
| return false; // No chunks includes offset byte. | ||
|
|
||
| --it; // Now it starts equal or before offset. | ||
| return (it->first + it->second) >= (offset + size); | ||
| } | ||
|
|
||
| size_t ChunkStream::GetFirstMissingByte() const { | ||
| if (chunks_.empty()) | ||
| return 0; | ||
| std::map<size_t, size_t>::const_iterator begin = chunks_.begin(); | ||
| return begin->first > 0 ? 0 : begin->second; | ||
| } | ||
|
|
||
| size_t ChunkStream::GetFirstMissingByteInInterval(size_t offset) const { | ||
| if (chunks_.empty()) | ||
| return 0; | ||
| std::map<size_t, size_t>::const_iterator it = chunks_.upper_bound(offset); | ||
| if (it == chunks_.begin()) | ||
| return 0; | ||
| --it; | ||
| return it->first + it->second; | ||
| } | ||
|
|
||
| size_t ChunkStream::GetLastMissingByteInInterval(size_t offset) const { | ||
| if (chunks_.empty()) | ||
| return stream_size_ - 1; | ||
| std::map<size_t, size_t>::const_iterator it = chunks_.upper_bound(offset); | ||
| if (it == chunks_.end()) | ||
| return stream_size_ - 1; | ||
| return it->first - 1; | ||
| } | ||
|
|
||
| } // namespace chrome_pdf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.