update to accommodate latest clang in chrome toolchain

src/core/SkRect.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkRect.h"
@@ skipping 96 matching lines @@
         if (fLeft < left) fLeft = left;
         if (fTop < top) fTop = top;
         if (fRight > right) fRight = right;
         if (fBottom > bottom) fBottom = bottom;
         return true;
     }
     return false;
 }
 
 bool SkRect::intersect(const SkRect& r) {
-    SkASSERT(&r);
     return this->intersect(r.fLeft, r.fTop, r.fRight, r.fBottom);
 }
 
 bool SkRect::intersect2(const SkRect& r) {
-    SkASSERT(&r);
     SkScalar L = SkMaxScalar(fLeft, r.fLeft);
     SkScalar R = SkMinScalar(fRight, r.fRight);
     if (L >= R) {
         return false;
     }
     SkScalar T = SkMaxScalar(fTop, r.fTop);
     SkScalar B = SkMinScalar(fBottom, r.fBottom);
     if (T >= B) {
         return false;
     }
     this->set(L, T, R, B);
     return true;
 }
 
 bool SkRect::intersect(const SkRect& a, const SkRect& b) {
-    SkASSERT(&a && &b);
 
     if (!a.isEmpty() && !b.isEmpty() &&
         a.fLeft < b.fRight && b.fLeft < a.fRight &&
         a.fTop < b.fBottom && b.fTop < a.fBottom) {
         fLeft   = SkMaxScalar(a.fLeft,   b.fLeft);
         fTop    = SkMaxScalar(a.fTop,    b.fTop);
         fRight  = SkMinScalar(a.fRight,  b.fRight);
         fBottom = SkMinScalar(a.fBottom, b.fBottom);
         return true;
     }
@@ skipping 10 matching lines @@
     // if we are empty, just assign
     if (fLeft >= fRight || fTop >= fBottom) {
         this->set(left, top, right, bottom);
     } else {
         if (left < fLeft) fLeft = left;
         if (top < fTop) fTop = top;
         if (right > fRight) fRight = right;
         if (bottom > fBottom) fBottom = bottom;
     }
 }