| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2013 Google Inc. | 2  * Copyright 2013 Google Inc. | 
| 3  * | 3  * | 
| 4  * Use of this source code is governed by a BSD-style license that can be | 4  * Use of this source code is governed by a BSD-style license that can be | 
| 5  * found in the LICENSE file. | 5  * found in the LICENSE file. | 
| 6  */ | 6  */ | 
| 7 | 7 | 
| 8 #include "SkDocument.h" | 8 #include "SkDocument.h" | 
| 9 #include "SkStream.h" | 9 #include "SkStream.h" | 
| 10 | 10 | 
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 53     return NULL; | 53     return NULL; | 
| 54 } | 54 } | 
| 55 | 55 | 
| 56 void SkDocument::endPage() { | 56 void SkDocument::endPage() { | 
| 57     if (kInPage_State == fState) { | 57     if (kInPage_State == fState) { | 
| 58         fState = kBetweenPages_State; | 58         fState = kBetweenPages_State; | 
| 59         this->onEndPage(); | 59         this->onEndPage(); | 
| 60     } | 60     } | 
| 61 } | 61 } | 
| 62 | 62 | 
| 63 void SkDocument::close() { | 63 bool SkDocument::close() { | 
| 64     for (;;) { | 64     for (;;) { | 
| 65         switch (fState) { | 65         switch (fState) { | 
| 66             case kBetweenPages_State: | 66             case kBetweenPages_State: { | 
| 67                 fState = kClosed_State; | 67                 fState = kClosed_State; | 
| 68                 this->onClose(fStream); | 68                 bool success = this->onClose(fStream); | 
| 69 | 69 | 
| 70                 if (fDoneProc) { | 70                 if (fDoneProc) { | 
| 71                     fDoneProc(fStream); | 71                     fDoneProc(fStream); | 
| 72                 } | 72                 } | 
| 73                 // we don't own the stream, but we mark it NULL since we can | 73                 // we don't own the stream, but we mark it NULL since we can | 
| 74                 // no longer write to it. | 74                 // no longer write to it. | 
| 75                 fStream = NULL; | 75                 fStream = NULL; | 
| 76                 return; | 76                 return success; | 
|  | 77             } | 
| 77             case kInPage_State: | 78             case kInPage_State: | 
| 78                 this->endPage(); | 79                 this->endPage(); | 
| 79                 break; | 80                 break; | 
| 80             case kClosed_State: | 81             case kClosed_State: | 
| 81                 return; | 82                 return false; | 
| 82         } | 83         } | 
| 83     } | 84     } | 
| 84 } | 85 } | 
|  | 86 | 
|  | 87 void SkDocument::abort() { | 
|  | 88     fState = kClosed_State; | 
|  | 89 } | 
| OLD | NEW | 
|---|