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

SkPDF: Simplify PDFStream / emitObject() const

Browse Source 
Compress SkPDFStream's data on setData(), not emitObject(); no longer stateful.

SkPDFObject::emitObject is now const.  This makes it easier to reason about state.

Minimal performance gains.

Review URL: https://codereview.chromium.org/1304493002
This commit is contained in:
halcanary 2015-08-19 12:26:46 -07:00 committed by Commit bot
parent 216b643fc7
commit a060eba083
9 changed files with 62 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pdf/SkPDFBitmap.cpp
View File

@ -249,7 +249,7 @@ public:
~PDFAlphaBitmap() {}
void emitObject(SkWStream*,
const SkPDFObjNumMap&,
const SkPDFSubstituteMap&) override;
const SkPDFSubstituteMap&) const override;
private:
const SkBitmap fBitmap;
@ -257,7 +257,7 @@ private:
void PDFAlphaBitmap::emitObject(SkWStream* stream,
const SkPDFObjNumMap& objNumMap,
const SkPDFSubstituteMap& substitutes) {
const SkPDFSubstituteMap& substitutes) const {
SkAutoLockPixels autoLockPixels(fBitmap);
SkASSERT(fBitmap.colorType() != kIndex_8_SkColorType ||
fBitmap.getColorTable());
@ -293,7 +293,7 @@ public:
const SkAutoTUnref<SkPDFObject> fSMask;
void emitObject(SkWStream*,
const SkPDFObjNumMap&,
const SkPDFSubstituteMap&) override;
const SkPDFSubstituteMap&) const override;
void addResources(SkPDFObjNumMap*,
const SkPDFSubstituteMap&) const override;
PDFDefaultBitmap(const SkBitmap& bm, SkPDFObject* smask)
@ -345,7 +345,7 @@ static SkPDFArray* make_indexed_color_space(const SkColorTable* table) {
void PDFDefaultBitmap::emitObject(SkWStream* stream,
const SkPDFObjNumMap& objNumMap,
const SkPDFSubstituteMap& substitutes) {
const SkPDFSubstituteMap& substitutes) const {
SkAutoLockPixels autoLockPixels(fBitmap);
SkASSERT(fBitmap.colorType() != kIndex_8_SkColorType ||
fBitmap.getColorTable());
@ -407,12 +407,12 @@ public:
: SkPDFBitmap(bm), fData(SkRef(data)), fIsYUV(isYUV) {}
void emitObject(SkWStream*,
const SkPDFObjNumMap&,
const SkPDFSubstituteMap&) override;
const SkPDFSubstituteMap&) const override;
};
void PDFJpegBitmap::emitObject(SkWStream* stream,
const SkPDFObjNumMap& objNumMap,
const SkPDFSubstituteMap& substituteMap) {
const SkPDFSubstituteMap& substituteMap) const {
SkPDFDict pdfDict("XObject");
pdfDict.insertName("Subtype", "Image");
pdfDict.insertInt("Width", fBitmap.width());

2
src/pdf/SkPDFFont.cpp
View File

@ -1011,7 +1011,7 @@ SkPDFFont* SkPDFType0Font::getFontSubset(const SkPDFGlyphSet* subset) {
#ifdef SK_DEBUG
void SkPDFType0Font::emitObject(SkWStream* stream,
const SkPDFObjNumMap& objNumMap,
const SkPDFSubstituteMap& substitutes) {
const SkPDFSubstituteMap& substitutes) const {
SkASSERT(fPopulated);
return INHERITED::emitObject(stream, objNumMap, substitutes);
}

6
src/pdf/SkPDFFontImpl.h
View File

@ -18,9 +18,9 @@ public:
virtual bool multiByteGlyphs() const { return true; }
virtual SkPDFFont* getFontSubset(const SkPDFGlyphSet* usage);
#ifdef SK_DEBUG
virtual void emitObject(SkWStream*,
const SkPDFObjNumMap&,
const SkPDFSubstituteMap&);
void emitObject(SkWStream*,
const SkPDFObjNumMap&,
const SkPDFSubstituteMap&) const override;
#endif
private:

7
src/pdf/SkPDFGraphicState.cpp
View File

@ -195,9 +195,10 @@ SkPDFDict* SkPDFGraphicState::GetNoSMaskGraphicState() {
return SkRef(noSMaskGraphicState.get());
}
void SkPDFGraphicState::emitObject(SkWStream* stream,
const SkPDFObjNumMap& objNumMap,
const SkPDFSubstituteMap& substitutes) {
void SkPDFGraphicState::emitObject(
SkWStream* stream,
const SkPDFObjNumMap& objNumMap,
const SkPDFSubstituteMap& substitutes) const {
SkAutoTUnref<SkPDFDict> dict(SkNEW_ARGS(SkPDFDict, ("ExtGState")));
dict->insertName("Type", "ExtGState");

6
src/pdf/SkPDFGraphicState.h
View File

@ -32,9 +32,9 @@ public:
// Override emitObject so that we can populate the dictionary on
// demand.
virtual void emitObject(SkWStream* stream,
const SkPDFObjNumMap& objNumMap,
const SkPDFSubstituteMap& substitutes);
void emitObject(SkWStream* stream,
const SkPDFObjNumMap& objNumMap,
const SkPDFSubstituteMap& substitutes) const override;
/** Get the graphic state for the passed SkPaint. The reference count of
* the object is incremented and it is the caller's responsibility to

69
src/pdf/SkPDFStream.cpp
View File

@ -13,58 +13,43 @@
#include "SkStream.h"
#include "SkStreamPriv.h"
SkPDFStream::SkPDFStream(SkStream* stream) : fState(kUnused_State) {
this->setData(stream);
}
SkPDFStream::SkPDFStream(SkData* data) : fState(kUnused_State) {
this->setData(data);
}
SkPDFStream::~SkPDFStream() {}
void SkPDFStream::emitObject(SkWStream* stream,
const SkPDFObjNumMap& objNumMap,
const SkPDFSubstituteMap& substitutes) {
if (fState == kUnused_State) {
fState = kNoCompression_State;
SkDynamicMemoryWStream compressedData;
SkDeflateWStream deflateWStream(&compressedData);
SkAssertResult(SkStreamCopy(&deflateWStream, fDataStream.get()));
deflateWStream.finalize();
SkAssertResult(fDataStream->rewind());
if (compressedData.getOffset() < this->dataSize()) {
SkAutoTDelete<SkStream> compressed(
compressedData.detachAsStream());
this->setData(compressed.get());
this->insertName("Filter", "FlateDecode");
}
fState = kCompressed_State;
this->insertInt("Length", this->dataSize());
}
const SkPDFSubstituteMap& substitutes) const {
SkASSERT(fCompressedData);
this->INHERITED::emitObject(stream, objNumMap, substitutes);
// Note: emitObject isn't marked const, but could be in the future
SkAutoTDelete<SkStreamRewindable> dup(fCompressedData->duplicate());
SkASSERT(dup);
SkASSERT(dup->hasLength());
stream->writeText(" stream\n");
stream->writeStream(fDataStream.get(), fDataStream->getLength());
SkAssertResult(fDataStream->rewind());
stream->writeStream(dup.get(), dup->getLength());
stream->writeText("\nendstream");
}
SkPDFStream::SkPDFStream() : fState(kUnused_State) {}
void SkPDFStream::setData(SkData* data) {
// FIXME: Don't swap if the data is the same.
fDataStream.reset(SkNEW_ARGS(SkMemoryStream, (data)));
}
void SkPDFStream::setData(SkStream* stream) {
SkASSERT(!fCompressedData); // Only call this function once.
SkASSERT(stream);
// Code assumes that the stream starts at the beginning and is rewindable.
// SkStreamRewindableFromSkStream will try stream->duplicate().
fDataStream.reset(SkStreamRewindableFromSkStream(stream));
SkASSERT(fDataStream.get());
}
// Code assumes that the stream starts at the beginning.
size_t SkPDFStream::dataSize() const {
SkASSERT(fDataStream->hasLength());
return fDataStream->getLength();
SkDynamicMemoryWStream compressedData;
SkDeflateWStream deflateWStream(&compressedData);
SkStreamCopy(&deflateWStream, stream);
deflateWStream.finalize();
size_t length = compressedData.bytesWritten();
if (stream->hasLength()) {
SkAutoTDelete<SkStreamRewindable> dup(stream->duplicate());
if (dup && dup->hasLength() &&
dup->getLength() <= length + strlen("/Filter_/FlateDecode_")) {
this->insertInt("Length", dup->getLength());
fCompressedData.reset(dup.detach());
return;
}
}
fCompressedData.reset(compressedData.detachAsStream());
this->insertName("Filter", "FlateDecode");
this->insertInt("Length", length);
}

34
src/pdf/SkPDFStream.h
View File

@ -27,50 +27,38 @@ class SkPDFStream : public SkPDFDict {
public:
/** Create a PDF stream. A Length entry is automatically added to the
* stream dictionary.
* @param data The data part of the stream. Will be ref()ed.
* @param data The data part of the stream. Will not take ownership.
*/
explicit SkPDFStream(SkData* data);
explicit SkPDFStream(SkData* data) { this->setData(data); }
/** Create a PDF stream. A Length entry is automatically added to the
* stream dictionary.
* @param stream The data part of the stream. Will be duplicate()d.
* @param stream The data part of the stream. Will not take ownership.
*/
explicit SkPDFStream(SkStream* stream);
explicit SkPDFStream(SkStream* stream) { this->setData(stream); }
virtual ~SkPDFStream();
// The SkPDFObject interface.
void emitObject(SkWStream* stream,
const SkPDFObjNumMap& objNumMap,
const SkPDFSubstituteMap& substitutes) override;
const SkPDFSubstituteMap& substitutes) const override;
protected:
enum State {
kUnused_State, //!< The stream hasn't been requested yet.
kNoCompression_State, //!< The stream's been requested in an
// uncompressed form.
kCompressed_State, //!< The stream's already been compressed.
};
/* Create a PDF stream with no data. The setData method must be called to
* set the data.
*/
SkPDFStream();
SkPDFStream() {}
void setData(SkData* data);
/** Only call this function once. */
void setData(SkStream* stream);
size_t dataSize() const;
void setState(State state) {
fState = state;
void setData(SkData* data) {
SkMemoryStream memoryStream(data);
this->setData(&memoryStream);
}
private:
// Indicates what form (or if) the stream has been requested.
State fState;
SkAutoTDelete<SkStreamRewindable> fDataStream;
SkAutoTDelete<SkStreamRewindable> fCompressedData;
typedef SkPDFDict INHERITED;
};

8
src/pdf/SkPDFTypes.cpp
View File

@ -260,7 +260,7 @@ SkPDFUnion SkPDFUnion::Object(SkPDFObject* ptr) {
#if 0 // Enable if needed.
void SkPDFAtom::emitObject(SkWStream* stream,
const SkPDFObjNumMap& objNumMap,
const SkPDFSubstituteMap& substitutes) {
const SkPDFSubstituteMap& substitutes) const {
fValue.emitObject(stream, objNumMap, substitutes);
}
void SkPDFAtom::addResources(SkPDFObjNumMap* map,
@ -284,8 +284,8 @@ int SkPDFArray::size() const { return fValues.count(); }
void SkPDFArray::reserve(int length) { fValues.setReserve(length); }
void SkPDFArray::emitObject(SkWStream* stream,
const SkPDFObjNumMap& objNumMap,
const SkPDFSubstituteMap& substitutes) {
const SkPDFObjNumMap& objNumMap,
const SkPDFSubstituteMap& substitutes) const {
stream->writeText("[");
for (int i = 0; i < fValues.count(); i++) {
fValues[i].emitObject(stream, objNumMap, substitutes);
@ -353,7 +353,7 @@ SkPDFDict::SkPDFDict(const char type[]) { this->insertName("Type", type); }
void SkPDFDict::emitObject(SkWStream* stream,
const SkPDFObjNumMap& objNumMap,
const SkPDFSubstituteMap& substitutes) {
const SkPDFSubstituteMap& substitutes) const {
stream->writeText("<<");
for (int i = 0; i < fRecords.count(); i++) {
fRecords[i].fKey.emitObject(stream, objNumMap, substitutes);

6
src/pdf/SkPDFTypes.h
View File

@ -40,7 +40,7 @@ public:
// TODO(halcanary): make this method const
virtual void emitObject(SkWStream* stream,
const SkPDFObjNumMap& objNumMap,
const SkPDFSubstituteMap& substitutes) = 0;
const SkPDFSubstituteMap& substitutes) const = 0;
/**
* Adds all transitive dependencies of this object to the
@ -200,7 +200,7 @@ public:
// The SkPDFObject interface.
void emitObject(SkWStream* stream,
const SkPDFObjNumMap& objNumMap,
const SkPDFSubstituteMap& substitutes) override;
const SkPDFSubstituteMap& substitutes) const override;
void addResources(SkPDFObjNumMap*,
const SkPDFSubstituteMap&) const override;
@ -255,7 +255,7 @@ public:
// The SkPDFObject interface.
void emitObject(SkWStream* stream,
const SkPDFObjNumMap& objNumMap,
const SkPDFSubstituteMap& substitutes) override;
const SkPDFSubstituteMap& substitutes) const override;
void addResources(SkPDFObjNumMap*,
const SkPDFSubstituteMap&) const override;