Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Unified Diff: src/utils/SkFrontBufferedStream.cpp

Issue 1490923005: Allow SkStream::peek() to partially succeed (Closed) Base URL: https://skia.googlesource.com/skia.git@wbmp
Patch Set: Use the correct return type Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkStream.cpp ('k') | tests/StreamTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/utils/SkFrontBufferedStream.cpp
diff --git a/src/utils/SkFrontBufferedStream.cpp b/src/utils/SkFrontBufferedStream.cpp
index 0955cfaf712b7c8296ab4eecb4cb36042a5698cc..e0b586a29d830fbfa00cbf5d954bbc5162ef0d46 100644
--- a/src/utils/SkFrontBufferedStream.cpp
+++ b/src/utils/SkFrontBufferedStream.cpp
@@ -16,7 +16,7 @@ public:
size_t read(void* buffer, size_t size) override;
- bool peek(void* buffer, size_t size) const override;
+ size_t peek(void* buffer, size_t size) const override;
bool isAtEnd() const override;
@@ -157,18 +157,20 @@ size_t FrontBufferedStream::readDirectlyFromStream(char* dst, size_t size) {
return bytesReadDirectly;
}
-bool FrontBufferedStream::peek(void* dst, size_t size) const {
+size_t FrontBufferedStream::peek(void* dst, size_t size) const {
// Keep track of the offset so we can return to it.
const size_t start = fOffset;
- if (start + size > fBufferSize) {
- // This stream is not able to buffer enough.
- return false;
+
+ if (start >= fBufferSize) {
+ // This stream is not able to buffer.
+ return 0;
}
+
+ size = SkTMin(size, fBufferSize - start);
FrontBufferedStream* nonConstThis = const_cast<FrontBufferedStream*>(this);
- SkDEBUGCODE(const size_t bytesRead =) nonConstThis->read(dst, size);
- SkASSERT(bytesRead == size);
+ const size_t bytesRead = nonConstThis->read(dst, size);
nonConstThis->fOffset = start;
- return true;
+ return bytesRead;
}
size_t FrontBufferedStream::read(void* voidDst, size_t size) {
« no previous file with comments | « src/core/SkStream.cpp ('k') | tests/StreamTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698