commit 152f524fd325b7776b01f84afbfe2fa071648a05
author robertphillips <robertphillips@google.com> Wed Jan 07 09:01:12 2015 -0800
committer Commit bot <commit-bot@chromium.org> Wed Jan 07 09:01:13 2015 -0800
tree 52255f53268067cf9e66272b67ca15711d8c4813
parent bd0d9da981289504c9dcd8547eaad52b1f4a52cb

It is dangerous to ignore SkRect::intersect's return value

Review URL: https://codereview.chromium.org/833943002

gm/gmmain.cpp

diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index ece8ff3..1652e61 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -704,8 +704,10 @@
                 SkRect content = SkRect::MakeWH(SkIntToScalar(pageSize.width()),
                                                 SkIntToScalar(pageSize.height()));
                 initialTransform.mapRect(&content);
-                content.intersect(0, 0, SkIntToScalar(pageSize.width()),
-                                  SkIntToScalar(pageSize.height()));
+                if (!content.intersect(0, 0, SkIntToScalar(pageSize.width()),
+                                       SkIntToScalar(pageSize.height()))) {
+                    content.setEmpty();
+                }
                 SkISize contentSize =
                     SkISize::Make(SkScalarRoundToInt(content.width()),
                                   SkScalarRoundToInt(content.height()));