Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Unified Diff: src/core/SkBBoxHierarchyRecord.cpp

Issue 54603004: Revert "Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warn… (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/animator/SkDrawPaint.cpp ('k') | src/core/SkBBoxRecord.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkBBoxHierarchyRecord.cpp
diff --git a/src/core/SkBBoxHierarchyRecord.cpp b/src/core/SkBBoxHierarchyRecord.cpp
index 61a82cef3db94d6f29384be4cb0ed69315dff101..8e5861bb21e6b6b993b7a32f60309ff5e0cf9d18 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();
}
« no previous file with comments | « src/animator/SkDrawPaint.cpp ('k') | src/core/SkBBoxRecord.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698