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

Side by Side Diff: Source/WebCore/rendering/RenderLayer.h

Issue 10392139: Merge 115471 - Infinite backgroundClipRect should not be scrolled. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 7 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 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 , m_hasRadius(false) 93 , m_hasRadius(false)
94 { } 94 { }
95 95
96 const LayoutRect& rect() const { return m_rect; } 96 const LayoutRect& rect() const { return m_rect; }
97 void setRect(const LayoutRect& rect) { m_rect = rect; } 97 void setRect(const LayoutRect& rect) { m_rect = rect; }
98 98
99 bool hasRadius() const { return m_hasRadius; } 99 bool hasRadius() const { return m_hasRadius; }
100 void setHasRadius(bool hasRadius) { m_hasRadius = hasRadius; } 100 void setHasRadius(bool hasRadius) { m_hasRadius = hasRadius; }
101 101
102 bool operator==(const ClipRect& other) const { return rect() == other.rect() && hasRadius() == other.hasRadius(); } 102 bool operator==(const ClipRect& other) const { return rect() == other.rect() && hasRadius() == other.hasRadius(); }
103 bool operator!=(const ClipRect& other) const { return rect() != other.rect() || hasRadius() != other.hasRadius(); }
103 104
104 void intersect(const LayoutRect& other) { m_rect.intersect(other); } 105 void intersect(const LayoutRect& other) { m_rect.intersect(other); }
105 void intersect(const ClipRect& other) 106 void intersect(const ClipRect& other)
106 { 107 {
107 m_rect.intersect(other.rect()); 108 m_rect.intersect(other.rect());
108 if (other.hasRadius()) 109 if (other.hasRadius())
109 m_hasRadius = true; 110 m_hasRadius = true;
110 } 111 }
111 void move(LayoutUnit x, LayoutUnit y) { m_rect.move(x, y); } 112 void move(LayoutUnit x, LayoutUnit y) { m_rect.move(x, y); }
112 113
(...skipping 769 matching lines...) Expand 10 before | Expand all | Expand 10 after
882 883
883 } // namespace WebCore 884 } // namespace WebCore
884 885
885 #ifndef NDEBUG 886 #ifndef NDEBUG
886 // Outside the WebCore namespace for ease of invocation from gdb. 887 // Outside the WebCore namespace for ease of invocation from gdb.
887 void showLayerTree(const WebCore::RenderLayer*); 888 void showLayerTree(const WebCore::RenderLayer*);
888 void showLayerTree(const WebCore::RenderObject*); 889 void showLayerTree(const WebCore::RenderObject*);
889 #endif 890 #endif
890 891
891 #endif // RenderLayer_h 892 #endif // RenderLayer_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698