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

Side by Side Diff: Source/core/rendering/RenderView.cpp

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix a crashers (everything is building!) Created 5 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 } 127 }
128 128
129 LayoutUnit RenderView::availableLogicalHeight(AvailableLogicalHeightType heightT ype) const 129 LayoutUnit RenderView::availableLogicalHeight(AvailableLogicalHeightType heightT ype) const
130 { 130 {
131 // If we have columns, then the available logical height is reduced to the c olumn height. 131 // If we have columns, then the available logical height is reduced to the c olumn height.
132 if (hasColumns()) 132 if (hasColumns())
133 return columnInfo()->columnHeight(); 133 return columnInfo()->columnHeight();
134 return RenderBlockFlow::availableLogicalHeight(heightType); 134 return RenderBlockFlow::availableLogicalHeight(heightType);
135 } 135 }
136 136
137 bool RenderView::isChildAllowed(RenderObject* child, RenderStyle*) const 137 bool RenderView::isChildAllowed(RenderObject* child, const RenderStyle*) const
138 { 138 {
139 return child->isBox(); 139 return child->isBox();
140 } 140 }
141 141
142 void RenderView::layoutContent() 142 void RenderView::layoutContent()
143 { 143 {
144 ASSERT(needsLayout()); 144 ASSERT(needsLayout());
145 145
146 RenderBlockFlow::layout(); 146 RenderBlockFlow::layout();
147 147
(...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after
975 return viewWidth(IncludeScrollbars) / scale; 975 return viewWidth(IncludeScrollbars) / scale;
976 } 976 }
977 977
978 double RenderView::layoutViewportHeight() const 978 double RenderView::layoutViewportHeight() const
979 { 979 {
980 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1; 980 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1;
981 return viewHeight(IncludeScrollbars) / scale; 981 return viewHeight(IncludeScrollbars) / scale;
982 } 982 }
983 983
984 } // namespace blink 984 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698