diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-31 16:31:11 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-31 16:31:11 +0000 |
| commit | 6fcbfcead5dc1b61fa5b4c139a1a3714e8c58091 (patch) | |
| tree | c7bfb4b07deb28223c78af4de69e2440f34c3427 /src/gpu/GrReducedClip.cpp | |
| parent | 081560e3abe25c4821b79ca1465f4dbd371c4b5c (diff) | |
Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning"
This reverts commit 1d22c4aaf9d8f053f25194a1ed74b137bfb19497.
git-svn-id: http://skia.googlecode.com/svn/trunk@12056 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrReducedClip.cpp')
| -rw-r--r-- | src/gpu/GrReducedClip.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrReducedClip.cpp b/src/gpu/GrReducedClip.cpp index a5f4519ea7..2b6583e3e3 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::Make(queryBounds); + SkRect scalarQueryBounds = SkRect::MakeFromIRect(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::Make(*tighterBounds); + SkRect scalarTighterBounds = SkRect::MakeFromIRect(*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::Make(*bounds); + SkRect scalarBounds = SkRect::MakeFromIRect(*bounds); // Now that we have determined the bounds to use and filtered out the trivial cases, call the // helper that actually walks the stack. |