diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-31 17:28:30 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-31 17:28:30 +0000 |
| commit | 4469938e92d779dff05e745559e67907bbf21e78 (patch) | |
| tree | c87072ff8cef5709436279a1f771160511debd2a /src/pipe | |
| parent | 6fcbfcead5dc1b61fa5b4c139a1a3714e8c58091 (diff) | |
Revert "Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning""
This reverts commit 1e787c38fa71f2a21fd728f1b1d620b9b09b0d3d.
BUG=
Review URL: https://codereview.chromium.org/54603004
git-svn-id: http://skia.googlecode.com/svn/trunk@12057 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/pipe')
| -rw-r--r-- | src/pipe/SkGPipeWrite.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp index 50043c6a2d..b61de1c912 100644 --- a/src/pipe/SkGPipeWrite.cpp +++ b/src/pipe/SkGPipeWrite.cpp @@ -294,7 +294,7 @@ private: inline void doNotify() { if (!fDone) { - size_t bytes = fWriter.size() - fBytesNotified; + size_t bytes = fWriter.bytesWritten() - fBytesNotified; if (bytes > 0) { fController->notifyWritten(bytes); fBytesNotified += bytes; @@ -467,7 +467,7 @@ bool SkGPipeCanvas::needOpBytes(size_t needed) { } needed += 4; // size of DrawOp atom - if (fWriter.size() + needed > fBlockSize) { + if (fWriter.bytesWritten() + needed > fBlockSize) { // Before we wipe out any data that has already been written, read it // out. this->doNotify(); |