Refactor to remove need for infiniteIntRect when computing rects in pre-paint

third_party/WebKit/Source/core/paint/ClipRect.h

 /*
  * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef ClipRect_h
 #define ClipRect_h
 
 #include "platform/geometry/LayoutRect.h"
+#include "platform/graphics/paint/FloatClipRect.h"
 #include "wtf/Allocator.h"
 
 namespace blink {
 
 class HitTestLocation;
 
 class ClipRect {
   USING_FAST_MALLOC(ClipRect);
 
  public:
   ClipRect() : m_hasRadius(false) {}
 
   ClipRect(const LayoutRect& rect) : m_rect(rect), m_hasRadius(false) {}
 
+  ClipRect(const FloatClipRect& rect)
+      : m_rect(LayoutRect(rect.rect())), m_hasRadius(rect.hasRadius()) {}
+
   const LayoutRect& rect() const { return m_rect; }
 
   bool hasRadius() const { return m_hasRadius; }
   void setHasRadius(bool hasRadius) { m_hasRadius = hasRadius; }
 
   bool operator==(const ClipRect& other) const {
     return rect() == other.rect() && hasRadius() == other.hasRadius();
   }
   bool operator!=(const ClipRect& other) const {
     return rect() != other.rect() || hasRadius() != other.hasRadius();
@@ skipping 24 matching lines @@
 
 inline ClipRect intersection(const ClipRect& a, const ClipRect& b) {
   ClipRect c = a;
   c.intersect(b);
   return c;
 }
 
 }  // namespace blink
 
 #endif  // ClipRect_h