commit a766ca9af12e1175cfb01f4b516802da9197ba78
author Mike Reed <reed@google.com> Tue Jan 09 11:31:53 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 09 16:54:52 2018 +0000
tree 738b9fa0c40ce361a45c6b2d49353f9b9431219d
parent 99578d24c0abd5b0e4fa2fc40b44fbec0c2bd627

use 64bit math to compute is a rect is empty

Will work next to try to make isEmpty() private

Bug: skia:7470
Bug:799715
Change-Id: I7b43028ecd86dca68e0c67225712516d2f2f88a2
Reviewed-on: https://skia-review.googlesource.com/92620
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/core/SkAAClip.cpp

diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
index c0707c5..b22b8eb 100644
--- a/src/core/SkAAClip.cpp
+++ b/src/core/SkAAClip.cpp
@@ -704,7 +704,7 @@
 }
 
 bool SkAAClip::setRect(const SkIRect& bounds) {
-    if (!SkRectPriv::PositiveDimensions(bounds)) {
+    if (bounds.isEmpty()) {
         return this->setEmpty();
     }
 

src/core/SkRectPriv.h

diff --git a/src/core/SkRectPriv.h b/src/core/SkRectPriv.h
index 01d184d..8b663ab 100644
--- a/src/core/SkRectPriv.h
+++ b/src/core/SkRectPriv.h
@@ -12,14 +12,6 @@
 
 class SkRectPriv {
 public:
-    // Returns true iff width and height are positive. Catches inverted, empty, and overflowing
-    // (way too big) rects. This is used by clients that want a non-empty rect that they can also
-    // actually use its computed width/height.
-    //
-    static bool PositiveDimensions(const SkIRect& r) {
-        return r.width() > 0 && r.height() > 0;
-    }
-
     static SkRect MakeLargestS32() {
         const int32_t ihalf = SK_MaxS32 >> 1;
         const SkScalar half = SkIntToScalar(ihalf);

src/core/SkRegion.cpp

diff --git a/src/core/SkRegion.cpp b/src/core/SkRegion.cpp
index ba185ae..8c402e9 100644
--- a/src/core/SkRegion.cpp
+++ b/src/core/SkRegion.cpp
@@ -140,21 +140,16 @@
     return false;
 }
 
-bool SkRegion::setRect(int32_t left, int32_t top,
-                       int32_t right, int32_t bottom) {
-    if (left >= right || top >= bottom) {
+bool SkRegion::setRect(const SkIRect& r) {
+    if (r.isEmpty()) {
         return this->setEmpty();
     }
     this->freeRuns();
-    fBounds.set(left, top, right, bottom);
+    fBounds = r;
     fRunHead = SkRegion_gRectRunHeadPtr;
     return true;
 }
 
-bool SkRegion::setRect(const SkIRect& r) {
-    return this->setRect(r.fLeft, r.fTop, r.fRight, r.fBottom);
-}
-
 bool SkRegion::setRegion(const SkRegion& src) {
     if (this != &src) {
         this->freeRuns();