commit 7e587330c8185a778b7d91f90ba2eb4ca0a5cfcd
author Mike Klein <mtklein@google.com> Thu Oct 04 10:12:37 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Oct 04 22:05:27 2018 +0000
tree 95c78ec1fbb294262f2bcf925dc307fcfdd7f463
parent b7e03716500e0d032484e827a46fc5c0505247b8

Reland "remove deprecated SkRect::MakeFromIRect()"

This is a reland of 4fea17393a6f59c9c55fa75fc688d6beee6d3813

Original change's description:
> remove deprecated SkRect::MakeFromIRect()
> 
> Needs https://chromium-review.googlesource.com/c/chromium/src/+/1261818
> 
> Change-Id: I529a2cd16d46ad13bc1eb9d3746e3587e25e9dbe
> Reviewed-on: https://skia-review.googlesource.com/c/159481
> Reviewed-by: Cary Clark <caryclark@google.com>

Change-Id: I53e5b23f765d5b28df50bea70cd8d8f9aac7e740
Reviewed-on: https://skia-review.googlesource.com/c/159821
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

docs/SkRect_Reference.bmh

diff --git a/docs/SkRect_Reference.bmh b/docs/SkRect_Reference.bmh
index dce2588..ddb405c 100644
--- a/docs/SkRect_Reference.bmh
+++ b/docs/SkRect_Reference.bmh
@@ -258,12 +258,6 @@
 
 # ------------------------------------------------------------------------------
 
-#Method static SkRect SK_WARN_UNUSED_RESULT MakeFromIRect(const SkIRect& irect)
-#Deprecated
-##
-
-# ------------------------------------------------------------------------------
-
 #Method static SkRect Make(const SkISize& size)
 
 #In Constructor

include/core/SkRect.h

diff --git a/include/core/SkRect.h b/include/core/SkRect.h
index ecb01f4..ad52227 100644
--- a/include/core/SkRect.h
+++ b/include/core/SkRect.h
@@ -778,18 +778,6 @@
         return SkRect {x, y, x + w, y + h};
     }
 
-    /** Deprecated.
-    */
-    SK_ATTR_DEPRECATED("use Make()")
-    static SkRect SK_WARN_UNUSED_RESULT MakeFromIRect(const SkIRect& irect) {
-        SkRect r;
-        r.set(SkIntToScalar(irect.fLeft),
-              SkIntToScalar(irect.fTop),
-              SkIntToScalar(irect.fRight),
-              SkIntToScalar(irect.fBottom));
-        return r;
-    }
-
     /** Returns constructed SkIRect set to (0, 0, size.width(), size.height()).
         Does not validate input; size.width() or size.height() may be negative.
 

src/compute/sk/SkDevice_Compute.cpp

diff --git a/src/compute/sk/SkDevice_Compute.cpp b/src/compute/sk/SkDevice_Compute.cpp
index fd2a2ea..41e2ae5 100644
--- a/src/compute/sk/SkDevice_Compute.cpp
+++ b/src/compute/sk/SkDevice_Compute.cpp
@@ -248,7 +248,7 @@
     skc_raster_clip_weakref_t clip_weakref = fClipWeakref;
 
     // TODO Support arbitrary path clip?
-    SkRect devClip = SkRect::MakeFromIRect(this->devClipBounds());
+    SkRect devClip = SkRect::Make(this->devClipBounds());
     const float clip[] = { devClip.fLeft, devClip.fTop, devClip.fRight, devClip.fBottom };
 
     //