AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SkPDF: always assume SkStreamAsset behaves as specified

Browse Source 
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2104223003

Review-Url: https://codereview.chromium.org/2104223003
This commit is contained in:
halcanary 2016-06-29 07:23:47 -07:00 committed by Commit bot
parent d48e5b8640
commit 2633e62f77
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/pdf/SkPDFStream.cpp
View File

@ -32,42 +32,32 @@ void SkPDFStream::emitObject(SkWStream* stream,
stream->writeText("\nendstream");
}
void SkPDFStream::setData(SkStreamAsset* stream) {
SkASSERT(!fCompressedData); // Only call this function once.
SkASSERT(stream);
// Code assumes that the stream starts at the beginning.
#ifdef SK_PDF_LESS_COMPRESSION
std::unique_ptr<SkStreamAsset> duplicate(stream->duplicate());
SkASSERT(duplicate && duplicate->hasLength());
if (duplicate && duplicate->hasLength()) {
this->insertInt("Length", duplicate->getLength());
fCompressedData.reset(duplicate.release());
return;
}
#endif
fCompressedData.reset(stream->duplicate());
SkASSERT(fCompressedData && fCompressedData->hasLength());
this->insertInt("Length", fCompressedData->getLength());
#else
SkASSERT(stream->hasLength());
SkDynamicMemoryWStream compressedData;
SkDeflateWStream deflateWStream(&compressedData);
SkStreamCopy(&deflateWStream, stream);
deflateWStream.finalize();
size_t length = compressedData.bytesWritten();
size_t compressedLength = compressedData.bytesWritten();
size_t originalLength = stream->getLength();
SkASSERT(stream->hasLength());
if (stream->hasLength()) {
std::unique_ptr<SkStreamAsset> dup(stream->duplicate());
SkASSERT(stream->hasLength());
SkASSERT(stream->getLength() == dup->getLength());
SkASSERT(dup && dup->hasLength());
if (dup && dup->hasLength() &&
dup->getLength() <= length + strlen("/Filter_/FlateDecode_")) {
this->insertInt("Length", dup->getLength());
fCompressedData.reset(dup.release());
return;
}
if (originalLength <= compressedLength + strlen("/Filter_/FlateDecode_")) {
fCompressedData.reset(stream->duplicate());
this->insertInt("Length", originalLength);
return;
}
fCompressedData.reset(compressedData.detachAsStream());
this->insertName("Filter", "FlateDecode");
this->insertInt("Length", length);
this->insertInt("Length", compressedLength);
#endif
}