Add handling for Skia's SkPath::intersect's return value

chrome/browser/ui/views/tabs/tab.cc

Index: chrome/browser/ui/views/tabs/tab.cc
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index 680d3e6462764e3595edfbf9aa514f50991c05fc..a1d6b68a62c8955f66ac59dc2639b5da470a4fb9 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -710,9 +710,10 @@ bool Tab::GetHitTestMask(gfx::Path* mask) const {
   controller_->ShouldPaintTab(this, &clip);
   if (clip.size().GetArea()) {
     SkRect intersection(mask->getBounds());
-    intersection.intersect(RectToSkRect(clip));
     mask->reset();
-    mask->addRect(intersection);
+    if (intersection.intersect(RectToSkRect(clip))) {

[sky, 2015/01/05 16:32:44]

If the two don't intersect, then I think this function should return false.

[tdanderson, 2015/01/05 17:16:43]

I agree. Change the block starting at line 711 to this:

if (clip.size().GetArea()) {
  SkRect intersection(mask->getBounds());
  mask->reset();
  if (!intersection.intersect(RectToSkRect(clip)))
    return false;
  mask->addRect(intersection);
}

[robertphillips, 2015/01/05 19:31:56]

Done.

+      mask->addRect(intersection);
+    }
   }
 
   return true;