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

Unified Diff: src/gpu/GrReducedClip.cpp

Issue 51033004: add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning (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/gpu/GrInOrderDrawBuffer.cpp ('k') | src/gpu/SkGpuDevice.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrReducedClip.cpp
diff --git a/src/gpu/GrReducedClip.cpp b/src/gpu/GrReducedClip.cpp
index 2b6583e3e328f2a5454620a3c2ae68b3a992c7de..a5f4519ea7d7eaca4961bdee5d78cefcf7d68423 100644
--- a/src/gpu/GrReducedClip.cpp
+++ b/src/gpu/GrReducedClip.cpp
@@ -51,7 +51,7 @@ void ReduceClipStack(const SkClipStack& stack,
const SkIRect* bounds = &queryBounds;
- SkRect scalarQueryBounds = SkRect::MakeFromIRect(queryBounds);
+ SkRect scalarQueryBounds = SkRect::Make(queryBounds);
if (iior) {
SkASSERT(SkClipStack::kNormal_BoundsType == stackBoundsType);
@@ -67,7 +67,7 @@ void ReduceClipStack(const SkClipStack& stack,
} else if (isectRect.intersect(stackBounds, scalarQueryBounds)) {
if (NULL != tighterBounds) {
isectRect.roundOut(tighterBounds);
- SkRect scalarTighterBounds = SkRect::MakeFromIRect(*tighterBounds);
+ SkRect scalarTighterBounds = SkRect::Make(*tighterBounds);
if (scalarTighterBounds == isectRect) {
// the round-out didn't add any area outside the clip rect.
*requiresAA = false;
@@ -119,7 +119,7 @@ void ReduceClipStack(const SkClipStack& stack,
}
}
- SkRect scalarBounds = SkRect::MakeFromIRect(*bounds);
+ SkRect scalarBounds = SkRect::Make(*bounds);
// Now that we have determined the bounds to use and filtered out the trivial cases, call the
// helper that actually walks the stack.
« no previous file with comments | « src/gpu/GrInOrderDrawBuffer.cpp ('k') | src/gpu/SkGpuDevice.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698