Add CFX_FloatRect::ToFxRect().

core/src/fxcrt/fx_basic_coords.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <limits.h>
 
 #include "core/include/fxcrt/fx_coordinates.h"
 #include "core/include/fxcrt/fx_ext.h"
@@ skipping 169 matching lines @@
   i2 = i1 + length;
 }
 FX_RECT CFX_FloatRect::GetClosestRect() const {
   CFX_FloatRect rect1 = *this;
   FX_RECT rect;
   _MatchFloatRange(rect1.left, rect1.right, rect.left, rect.right);
   _MatchFloatRange(rect1.bottom, rect1.top, rect.top, rect.bottom);
   rect.Normalize();
   return rect;
 }
-FX_BOOL CFX_FloatRect::Contains(const CFX_FloatRect& other_rect) const {
-  CFX_FloatRect n1 = *this;
+
+bool CFX_FloatRect::Contains(const CFX_FloatRect& other_rect) const {
+  CFX_FloatRect n1(*this);
+  CFX_FloatRect n2(other_rect);
   n1.Normalize();
-  CFX_FloatRect n2 = other_rect;
   n2.Normalize();
-  if (n2.left >= n1.left && n2.right <= n1.right && n2.bottom >= n1.bottom &&
-      n2.top <= n1.top) {
-    return TRUE;
-  }
-  return FALSE;
+  return n2.left >= n1.left && n2.right <= n1.right && n2.bottom >= n1.bottom &&
+         n2.top <= n1.top;
 }
-FX_BOOL CFX_FloatRect::Contains(FX_FLOAT x, FX_FLOAT y) const {
-  CFX_FloatRect n1 = *this;
+
+bool CFX_FloatRect::Contains(FX_FLOAT x, FX_FLOAT y) const {
+  CFX_FloatRect n1(*this);
   n1.Normalize();
   return x <= n1.right && x >= n1.left && y <= n1.top && y >= n1.bottom;
 }
+
 void CFX_FloatRect::UpdateRect(FX_FLOAT x, FX_FLOAT y) {
   if (left > x) {
     left = x;
   }
   if (right < x) {
     right = x;
   }
   if (bottom > y) {
     bottom = y;
   }
@@ skipping 292 matching lines @@
       left = x[i];
     }
     if (top < y[i]) {
       top = y[i];
     }
     if (bottom > y[i]) {
       bottom = y[i];
     }
   }
 }