5 files changed, 15 insertions, 17 deletions

diff --git a/src/core/SkDocument.cpp b/src/core/SkDocument.cpp
index fa25e44f86..29db7f05e1 100644
--- a/src/core/SkDocument.cpp
+++ b/src/core/SkDocument.cpp
@@ -58,12 +58,12 @@ void SkDocument::endPage() {
     }
 }
 
-bool SkDocument::close() {
+void SkDocument::close() {
     for (;;) {
         switch (fState) {
             case kBetweenPages_State: {
                 fState = kClosed_State;
-                bool success = this->onClose(fStream);
+                this->onClose(fStream);
 
                 if (fDoneProc) {
                     fDoneProc(fStream, false);
@@ -71,13 +71,13 @@ bool SkDocument::close() {
                 // we don't own the stream, but we mark it nullptr since we can
                 // no longer write to it.
                 fStream = nullptr;
-                return success;
+                return;
             }
             case kInPage_State:
                 this->endPage();
                 break;
             case kClosed_State:
-                return false;
+                return;
         }
     }
 }
diff --git a/src/pdf/SkPDFDocument.cpp b/src/pdf/SkPDFDocument.cpp
index 8734927901..ab5f465971 100644
--- a/src/pdf/SkPDFDocument.cpp
+++ b/src/pdf/SkPDFDocument.cpp
@@ -399,11 +399,11 @@ static sk_sp<SkPDFArray> make_srgb_output_intents() {
     return intentArray;
 }
 
-bool SkPDFDocument::onClose(SkWStream* stream) {
+void SkPDFDocument::onClose(SkWStream* stream) {
     SkASSERT(!fCanvas.get());
     if (fPages.empty()) {
         this->reset();
-        return false;
+        return;
     }
     auto docCatalog = sk_make_sp<SkPDFDict>("Catalog");
     if (fPDFA) {
@@ -428,7 +428,6 @@ bool SkPDFDocument::onClose(SkWStream* stream) {
     fObjectSerializer.serializeObjects(this->getStream());
     fObjectSerializer.serializeFooter(this->getStream(), docCatalog, fID);
     this->reset();
-    return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/pdf/SkPDFDocument.h b/src/pdf/SkPDFDocument.h
index eeafbca624..b62a7a59a2 100644
--- a/src/pdf/SkPDFDocument.h
+++ b/src/pdf/SkPDFDocument.h
@@ -53,7 +53,7 @@ public:
     virtual ~SkPDFDocument();
     SkCanvas* onBeginPage(SkScalar, SkScalar, const SkRect&) override;
     void onEndPage() override;
-    bool onClose(SkWStream*) override;
+    void onClose(SkWStream*) override;
     void onAbort() override;
 
     /**
diff --git a/src/utils/SkMultiPictureDocument.cpp b/src/utils/SkMultiPictureDocument.cpp
index c40f1c900b..217e7a3007 100644
--- a/src/utils/SkMultiPictureDocument.cpp
+++ b/src/utils/SkMultiPictureDocument.cpp
@@ -56,15 +56,14 @@ struct MultiPictureDocument final : public SkDocument {
         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 @@ struct MultiPictureDocument final : public SkDocument {
         p->serialize(wStream);
         fPages.reset();
         fSizes.reset();
-        return good;
+        return;
     }
     void onAbort() override {
         fPages.reset();
diff --git a/src/xps/SkDocument_XPS.cpp b/src/xps/SkDocument_XPS.cpp
index e1222c92bc..4a977aeaee 100644
--- a/src/xps/SkDocument_XPS.cpp
+++ b/src/xps/SkDocument_XPS.cpp
@@ -49,9 +49,9 @@ protected:
         fDevice.endSheet();
     }
 
-    bool onClose(SkWStream*) override {
+    void onClose(SkWStream*) override {
         SkASSERT(!fCanvas.get());
-        return fDevice.endPortfolio();
+        (void)fDevice.endPortfolio();
     }
 
     void onAbort() override {}