diff options
author | 2013-10-31 16:24:08 +0000 | |
---|---|---|
committer | 2013-10-31 16:24:08 +0000 | |
commit | 081560e3abe25c4821b79ca1465f4dbd371c4b5c (patch) | |
tree | c6b87adb0a09e54eee77ba3363956738a1b7967f /src/core/SkBBoxHierarchyRecord.cpp | |
parent | 94bdd7e3fcf493f827263bd922cb09fb4b50df4c (diff) |
add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning
BUG=
R=robertphillips@google.com, senorblanco@chromium.org, vandebo@chromium.org
Review URL: https://codereview.chromium.org/51033004
git-svn-id: http://skia.googlecode.com/svn/trunk@12055 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkBBoxHierarchyRecord.cpp')
-rw-r--r-- | src/core/SkBBoxHierarchyRecord.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/SkBBoxHierarchyRecord.cpp b/src/core/SkBBoxHierarchyRecord.cpp index 61a82cef3d..8e5861bb21 100644 --- a/src/core/SkBBoxHierarchyRecord.cpp +++ b/src/core/SkBBoxHierarchyRecord.cpp @@ -22,7 +22,7 @@ SkBBoxHierarchyRecord::SkBBoxHierarchyRecord(uint32_t recordFlags, void SkBBoxHierarchyRecord::handleBBox(const SkRect& bounds) { SkIRect r; bounds.roundOut(&r); - SkPictureStateTree::Draw* draw = fStateTree->appendDraw(this->writeStream().size()); + SkPictureStateTree::Draw* draw = fStateTree->appendDraw(this->writeStream().bytesWritten()); fBoundingHierarchy->insert(draw, r, true); } @@ -33,7 +33,7 @@ int SkBBoxHierarchyRecord::save(SaveFlags flags) { int SkBBoxHierarchyRecord::saveLayer(const SkRect* bounds, const SkPaint* paint, SaveFlags flags) { - fStateTree->appendSaveLayer(this->writeStream().size()); + fStateTree->appendSaveLayer(this->writeStream().bytesWritten()); return INHERITED::saveLayer(bounds, paint, flags); } @@ -80,27 +80,27 @@ void SkBBoxHierarchyRecord::setMatrix(const SkMatrix& matrix) { bool SkBBoxHierarchyRecord::clipRect(const SkRect& rect, SkRegion::Op op, bool doAntiAlias) { - fStateTree->appendClip(this->writeStream().size()); + fStateTree->appendClip(this->writeStream().bytesWritten()); return INHERITED::clipRect(rect, op, doAntiAlias); } bool SkBBoxHierarchyRecord::clipRegion(const SkRegion& region, SkRegion::Op op) { - fStateTree->appendClip(this->writeStream().size()); + fStateTree->appendClip(this->writeStream().bytesWritten()); return INHERITED::clipRegion(region, op); } bool SkBBoxHierarchyRecord::clipPath(const SkPath& path, SkRegion::Op op, bool doAntiAlias) { - fStateTree->appendClip(this->writeStream().size()); + fStateTree->appendClip(this->writeStream().bytesWritten()); return INHERITED::clipPath(path, op, doAntiAlias); } bool SkBBoxHierarchyRecord::clipRRect(const SkRRect& rrect, SkRegion::Op op, bool doAntiAlias) { - fStateTree->appendClip(this->writeStream().size()); + fStateTree->appendClip(this->writeStream().bytesWritten()); return INHERITED::clipRRect(rrect, op, doAntiAlias); } @@ -109,7 +109,7 @@ bool SkBBoxHierarchyRecord::shouldRewind(void* data) { // SkPicture has rewound its command stream. To match that rewind in the // BBH, we rewind all draws that reference commands that were recorded // past the point to which the SkPicture has rewound, which is given by - // writeStream().size(). + // writeStream().bytesWritten(). SkPictureStateTree::Draw* draw = static_cast<SkPictureStateTree::Draw*>(data); - return draw->fOffset >= writeStream().size(); + return draw->fOffset >= writeStream().bytesWritten(); } |