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

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

Issue 9371032: Merge 106694 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 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 2011 Adobe Systems Incorporated. All Rights Reserved. 2 * Copyright 2011 Adobe Systems Incorporated. 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 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 // is unique to the region. For now it just holds logical width information for RenderBlocks, but eventually 102 // is unique to the region. For now it just holds logical width information for RenderBlocks, but eventually
103 // it will also hold a custom style for any box (for region styling). 103 // it will also hold a custom style for any box (for region styling).
104 typedef HashMap<const RenderBox*, OwnPtr<RenderBoxRegionInfo> > RenderBoxReg ionInfoMap; 104 typedef HashMap<const RenderBox*, OwnPtr<RenderBoxRegionInfo> > RenderBoxReg ionInfoMap;
105 RenderBoxRegionInfoMap m_renderBoxRegionInfo; 105 RenderBoxRegionInfoMap m_renderBoxRegionInfo;
106 106
107 typedef HashMap<const RenderBox*, RefPtr<RenderStyle> > RenderBoxRegionStyle Map; 107 typedef HashMap<const RenderBox*, RefPtr<RenderStyle> > RenderBoxRegionStyle Map;
108 RenderBoxRegionStyleMap m_renderBoxRegionStyle; 108 RenderBoxRegionStyleMap m_renderBoxRegionStyle;
109 109
110 bool m_isValid; 110 bool m_isValid;
111 bool m_hasCustomRegionStyle; 111 bool m_hasCustomRegionStyle;
112
113 #ifndef NDEBUG
114 bool m_insideRegionPaint;
115 #endif
116 }; 112 };
117 113
118 inline RenderRegion* toRenderRegion(RenderObject* object) 114 inline RenderRegion* toRenderRegion(RenderObject* object)
119 { 115 {
120 ASSERT(!object || object->isRenderRegion()); 116 ASSERT(!object || object->isRenderRegion());
121 return static_cast<RenderRegion*>(object); 117 return static_cast<RenderRegion*>(object);
122 } 118 }
123 119
124 inline const RenderRegion* toRenderRegion(const RenderObject* object) 120 inline const RenderRegion* toRenderRegion(const RenderObject* object)
125 { 121 {
126 ASSERT(!object || object->isRenderRegion()); 122 ASSERT(!object || object->isRenderRegion());
127 return static_cast<const RenderRegion*>(object); 123 return static_cast<const RenderRegion*>(object);
128 } 124 }
129 125
130 // This will catch anyone doing an unnecessary cast. 126 // This will catch anyone doing an unnecessary cast.
131 void toRenderRegion(const RenderRegion*); 127 void toRenderRegion(const RenderRegion*);
132 128
133 } // namespace WebCore 129 } // namespace WebCore
134 130
135 #endif // RenderRegion_h 131 #endif // RenderRegion_h
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderFlowThread.cpp ('k') | Source/WebCore/rendering/RenderRegion.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698