add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning

src/gpu/GrReducedClip.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrReducedClip.h"
 
@@ skipping 33 matching lines @@
     // We initially look at whether the bounds alone is sufficient. We also use the stack bounds to
     // attempt to compute the tighterBounds.
 
     SkClipStack::BoundsType stackBoundsType;
     SkRect stackBounds;
     bool iior;
     stack.getBounds(&stackBounds, &stackBoundsType, &iior);
 
     const SkIRect* bounds = &queryBounds;
 
-    SkRect scalarQueryBounds = SkRect::MakeFromIRect(queryBounds);
+    SkRect scalarQueryBounds = SkRect::Make(queryBounds);
 
     if (iior) {
         SkASSERT(SkClipStack::kNormal_BoundsType == stackBoundsType);
         SkRect isectRect;
         if (stackBounds.contains(scalarQueryBounds)) {
             *initialState = kAllIn_InitialState;
             if (NULL != tighterBounds) {
                 *tighterBounds = queryBounds;
             }
             if (NULL != requiresAA) {
                *requiresAA = false;
             }
         } 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;
                     *initialState = kAllIn_InitialState;
                     return;
                 }
                 *initialState = kAllOut_InitialState;
                 // iior should only be true if aa/non-aa status matches among all elements.
                 SkClipStack::Iter iter(stack, SkClipStack::Iter::kTop_IterStart);
                 bool doAA = iter.prev()->isAA();
@@ skipping 31 matching lines @@
                    *requiresAA = false;
                 }
                 return;
             }
             if (NULL != tighterBounds) {
                 *tighterBounds = queryBounds;
             }
         }
     }
 
-    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.
     reduced_stack_walker(stack, scalarBounds, result, initialState, requiresAA);
 }
 
 void reduced_stack_walker(const SkClipStack& stack,
                           const SkRect& queryBounds,
                           ElementList* result,
                           InitialState* initialState,
@@ skipping 279 matching lines @@
                 result->popHead();
                 element = result->headIter().get();
             }
         }
     }
     if (NULL != requiresAA) {
         *requiresAA = numAAElements > 0;
     }
 }
 } // namespace GrReducedClip