Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(406)

Side by Side Diff: third_party/WebKit/Source/core/paint/ClipRect.h

Issue 2699593006: Refactor to remove need for infiniteIntRect when computing rects in pre-paint (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef ClipRect_h 26 #ifndef ClipRect_h
27 #define ClipRect_h 27 #define ClipRect_h
28 28
29 #include "platform/geometry/LayoutRect.h" 29 #include "platform/geometry/LayoutRect.h"
30 #include "platform/graphics/paint/FloatClipRect.h"
30 #include "wtf/Allocator.h" 31 #include "wtf/Allocator.h"
31 32
32 namespace blink { 33 namespace blink {
33 34
34 class HitTestLocation; 35 class HitTestLocation;
35 36
36 class ClipRect { 37 class ClipRect {
37 USING_FAST_MALLOC(ClipRect); 38 USING_FAST_MALLOC(ClipRect);
38 39
39 public: 40 public:
40 ClipRect() : m_hasRadius(false), m_isClippedByClipCss(false) {} 41 ClipRect() : m_hasRadius(false), m_isClippedByClipCss(false) {}
41 42
42 ClipRect(const LayoutRect& rect) 43 ClipRect(const LayoutRect& rect)
43 : m_rect(rect), m_hasRadius(false), m_isClippedByClipCss(false) {} 44 : m_rect(rect), m_hasRadius(false), m_isClippedByClipCss(false) {}
44 45
46 ClipRect(const FloatClipRect& rect)
47 : m_rect(LayoutRect(rect.rect())),
48 m_hasRadius(rect.hasRadius()),
49 m_isClippedByClipCss(false) {}
50
45 const LayoutRect& rect() const { return m_rect; } 51 const LayoutRect& rect() const { return m_rect; }
46 52
47 bool hasRadius() const { return m_hasRadius; } 53 bool hasRadius() const { return m_hasRadius; }
48 void setHasRadius(bool hasRadius) { m_hasRadius = hasRadius; } 54 void setHasRadius(bool hasRadius) { m_hasRadius = hasRadius; }
49 55
50 bool operator==(const ClipRect& other) const { 56 bool operator==(const ClipRect& other) const {
51 return rect() == other.rect() && hasRadius() == other.hasRadius(); 57 return rect() == other.rect() && hasRadius() == other.hasRadius();
52 } 58 }
53 bool operator!=(const ClipRect& other) const { 59 bool operator!=(const ClipRect& other) const {
54 return rect() != other.rect() || hasRadius() != other.hasRadius(); 60 return rect() != other.rect() || hasRadius() != other.hasRadius();
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 93
88 inline ClipRect intersection(const ClipRect& a, const ClipRect& b) { 94 inline ClipRect intersection(const ClipRect& a, const ClipRect& b) {
89 ClipRect c = a; 95 ClipRect c = a;
90 c.intersect(b); 96 c.intersect(b);
91 return c; 97 return c;
92 } 98 }
93 99
94 } // namespace blink 100 } // namespace blink
95 101
96 #endif // ClipRect_h 102 #endif // ClipRect_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698