document.close from bool to void
Nothing meaningful is returned, it is inconsistent with the bulk of the rest of skia's api. The C api is waiting on this change as well.
Required chrome CL: https://codereview.chromium.org/2355343003/
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2354403002
Review-Url: https://codereview.chromium.org/2354403002
diff --git a/src/utils/SkMultiPictureDocument.cpp b/src/utils/SkMultiPictureDocument.cpp
index c40f1c9..217e7a3 100644
--- a/src/utils/SkMultiPictureDocument.cpp
+++ b/src/utils/SkMultiPictureDocument.cpp
@@ -56,15 +56,14 @@
fSizes.push_back(fCurrentPageSize);
fPages.push_back(fPictureRecorder.finishRecordingAsPicture());
}
- bool onClose(SkWStream* wStream) override {
+ void onClose(SkWStream* wStream) override {
SkASSERT(wStream);
SkASSERT(wStream->bytesWritten() == 0);
- bool good = true;
- good &= wStream->writeText(SkMultiPictureDocumentProtocol::kMagic);
- good &= wStream->write32(SkMultiPictureDocumentProtocol::kVersion);
- good &= wStream->write32(SkToU32(fPages.count()));
+ wStream->writeText(SkMultiPictureDocumentProtocol::kMagic);
+ wStream->write32(SkMultiPictureDocumentProtocol::kVersion);
+ wStream->write32(SkToU32(fPages.count()));
for (SkSize s : fSizes) {
- good &= wStream->write(&s, sizeof(s));
+ wStream->write(&s, sizeof(s));
}
SkSize bigsize = SkMultiPictureDocumentProtocol::Join(fSizes);
SkCanvas* c = fPictureRecorder.beginRecording(SkRect::MakeSize(bigsize));
@@ -78,7 +77,7 @@
p->serialize(wStream);
fPages.reset();
fSizes.reset();
- return good;
+ return;
}
void onAbort() override {
fPages.reset();