remove dead code for returning 0 on overflow

Bug: skia:
Change-Id: I6e7aae1b09cf3a1c9728bdaaa4dbf4df4b2ec16d
Reviewed-on: https://skia-review.googlesource.com/58341
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Mike Reed <reed@google.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h
index 5e9e80fcdc..e14846fa37 100644
--- a/include/core/SkImageInfo.h
+++ b/include/core/SkImageInfo.h
@@ -317,19 +317,18 @@ public:
     }
 #endif
 
-#ifdef SK_SUPPORT_LEGACY_COMPUTEBYTESIZE_RET_0
-    /**
-     *  Returns the size (in bytes) of the image buffer that this info needs, given the specified
-     *  rowBytes. The rowBytes must be >= this->minRowBytes().
-     *  If the calculation overflows, or if the height is 0, this returns 0.
-     */
-#else
     /**
      *  Returns the size (in bytes) of the image buffer that this info needs, given the specified
      *  rowBytes. The rowBytes must be >= this->minRowBytes().
+     *
+     *  if (height == 0) {
+     *      return 0;
+     *  } else {
+     *      return (height - 1) * rowBytes + width * bytes_per_pixel;
+     *  }
+     *
      *  If the calculation overflows this returns SK_MaxSizeT
      */
-#endif
     size_t computeByteSize(size_t rowBytes) const;
 
     /**