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

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

Issue 2792833002: Revert of Optimize the pre-paint tree walk and ClipRects (Closed)
Patch Set: Created 3 years, 8 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 ClipRects_h 26 #ifndef ClipRects_h
27 #define ClipRects_h 27 #define ClipRects_h
28 28
29 #include "core/paint/ClipRect.h" 29 #include "core/paint/ClipRect.h"
30 #include "wtf/RefCounted.h"
30 31
31 namespace blink { 32 namespace blink {
32 33
33 class ClipRects { 34 class ClipRects : public RefCounted<ClipRects> {
34 USING_FAST_MALLOC(ClipRects); 35 USING_FAST_MALLOC(ClipRects);
35 36
36 public: 37 public:
38 static PassRefPtr<ClipRects> create() { return adoptRef(new ClipRects); }
39 static PassRefPtr<ClipRects> create(const ClipRects& other) {
40 return adoptRef(new ClipRects(other));
41 }
42
37 ClipRects() : m_fixed(0) {} 43 ClipRects() : m_fixed(0) {}
38 ClipRects(const LayoutRect& r)
39 : m_overflowClipRect(r),
40 m_fixedClipRect(r),
41 m_posClipRect(r),
42 m_fixed(0) {}
43 ClipRects(const ClipRects& other)
44 : m_overflowClipRect(other.overflowClipRect()),
45 m_fixedClipRect(other.fixedClipRect()),
46 m_posClipRect(other.posClipRect()),
47 m_fixed(other.fixed()) {}
48 44
49 void reset(const LayoutRect& r) { 45 void reset(const LayoutRect& r) {
50 m_overflowClipRect = r; 46 m_overflowClipRect = r;
51 m_fixedClipRect = r; 47 m_fixedClipRect = r;
52 m_posClipRect = r; 48 m_posClipRect = r;
53 m_fixed = 0; 49 m_fixed = 0;
54 } 50 }
55 51
56 const ClipRect& overflowClipRect() const { return m_overflowClipRect; } 52 const ClipRect& overflowClipRect() const { return m_overflowClipRect; }
57 void setOverflowClipRect(const ClipRect& r) { m_overflowClipRect = r; } 53 void setOverflowClipRect(const ClipRect& r) { m_overflowClipRect = r; }
(...skipping 17 matching lines...) Expand all
75 71
76 ClipRects& operator=(const ClipRects& other) { 72 ClipRects& operator=(const ClipRects& other) {
77 m_overflowClipRect = other.overflowClipRect(); 73 m_overflowClipRect = other.overflowClipRect();
78 m_fixedClipRect = other.fixedClipRect(); 74 m_fixedClipRect = other.fixedClipRect();
79 m_posClipRect = other.posClipRect(); 75 m_posClipRect = other.posClipRect();
80 m_fixed = other.fixed(); 76 m_fixed = other.fixed();
81 return *this; 77 return *this;
82 } 78 }
83 79
84 private: 80 private:
81 ClipRects(const LayoutRect& r)
82 : m_overflowClipRect(r),
83 m_fixedClipRect(r),
84 m_posClipRect(r),
85 m_fixed(0) {}
86
87 ClipRects(const ClipRects& other)
88 : m_overflowClipRect(other.overflowClipRect()),
89 m_fixedClipRect(other.fixedClipRect()),
90 m_posClipRect(other.posClipRect()),
91 m_fixed(other.fixed()) {}
92
85 ClipRect m_overflowClipRect; 93 ClipRect m_overflowClipRect;
86 ClipRect m_fixedClipRect; 94 ClipRect m_fixedClipRect;
87 ClipRect m_posClipRect; 95 ClipRect m_posClipRect;
88 unsigned m_fixed; 96 unsigned m_fixed;
89 }; 97 };
90 98
91 } // namespace blink 99 } // namespace blink
92 100
93 #endif // ClipRects_h 101 #endif // ClipRects_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/ClipRects.h ('k') | third_party/WebKit/Source/core/paint/ClipRectsCache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698