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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutView.cpp

Issue 2450093005: Support display: contents for elements, first-line and first-letter pseudos. (Closed)
Patch Set: Allow text as child of the LayoutView, since it can happen with display: contents Created 4 years 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) 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. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 LayoutUnit logicalHeight, 176 LayoutUnit logicalHeight,
177 LayoutUnit, 177 LayoutUnit,
178 LogicalExtentComputedValues& computedValues) const { 178 LogicalExtentComputedValues& computedValues) const {
179 computedValues.m_extent = LayoutUnit(viewLogicalHeightForBoxSizing()); 179 computedValues.m_extent = LayoutUnit(viewLogicalHeightForBoxSizing());
180 } 180 }
181 181
182 void LayoutView::updateLogicalWidth() { 182 void LayoutView::updateLogicalWidth() {
183 setLogicalWidth(LayoutUnit(viewLogicalWidthForBoxSizing())); 183 setLogicalWidth(LayoutUnit(viewLogicalWidthForBoxSizing()));
184 } 184 }
185 185
186 bool LayoutView::isChildAllowed(LayoutObject* child,
187 const ComputedStyle&) const {
188 return child->isBox();
189 }
190
191 void LayoutView::layoutContent() { 186 void LayoutView::layoutContent() {
192 ASSERT(needsLayout()); 187 ASSERT(needsLayout());
193 188
194 LayoutBlockFlow::layout(); 189 LayoutBlockFlow::layout();
195 190
196 #if ENABLE(ASSERT) 191 #if ENABLE(ASSERT)
197 checkLayoutState(); 192 checkLayoutState();
198 #endif 193 #endif
199 } 194 }
200 195
(...skipping 840 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 if (block) 1036 if (block)
1042 block->adjustChildDebugRect(rect); 1037 block->adjustChildDebugRect(rect);
1043 1038
1044 rect.setWidth(LayoutUnit(viewWidth(IncludeScrollbars))); 1039 rect.setWidth(LayoutUnit(viewWidth(IncludeScrollbars)));
1045 rect.setHeight(LayoutUnit(viewHeight(IncludeScrollbars))); 1040 rect.setHeight(LayoutUnit(viewHeight(IncludeScrollbars)));
1046 1041
1047 return rect; 1042 return rect;
1048 } 1043 }
1049 1044
1050 } // namespace blink 1045 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698