optimize setRectFan and join -- from profiling drawText

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 128 matching lines @@
         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;
     }
     return false;
 }
 
-void SkRect::join(SkScalar left, SkScalar top, SkScalar right,
-                  SkScalar bottom) {
+void SkRect::join(SkScalar left, SkScalar top, SkScalar right, SkScalar bottom) {
     // do nothing if the params are empty
     if (left >= right || top >= bottom) {
         return;
     }
 
     // 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;
+        fLeft   = SkMinScalar(fLeft, left);
+        fTop    = SkMinScalar(fTop, top);
+        fRight  = SkMaxScalar(fRight, right);
+        fBottom = SkMaxScalar(fBottom, bottom);
     }
 }