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

Side by Side Diff: Source/core/layout/LayoutFlexibleBox.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/layout/LayoutFlexibleBox.h ('k') | Source/core/layout/LayoutFrameSet.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 16 matching lines...) Expand all
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/layout/LayoutFlexibleBox.h" 32 #include "core/layout/LayoutFlexibleBox.h"
33 33
34 #include "core/frame/UseCounter.h" 34 #include "core/frame/UseCounter.h"
35 #include "core/layout/LayoutView.h" 35 #include "core/layout/LayoutView.h"
36 #include "core/layout/TextAutosizer.h" 36 #include "core/layout/TextAutosizer.h"
37 #include "core/layout/style/LayoutStyle.h" 37 #include "core/layout/style/ComputedStyle.h"
38 #include "core/paint/BlockPainter.h" 38 #include "core/paint/BlockPainter.h"
39 #include "core/paint/DeprecatedPaintLayer.h" 39 #include "core/paint/DeprecatedPaintLayer.h"
40 #include "platform/LengthFunctions.h" 40 #include "platform/LengthFunctions.h"
41 #include "wtf/MathExtras.h" 41 #include "wtf/MathExtras.h"
42 #include <limits> 42 #include <limits>
43 43
44 namespace blink { 44 namespace blink {
45 45
46 struct LayoutFlexibleBox::LineContext { 46 struct LayoutFlexibleBox::LineContext {
47 LineContext(LayoutUnit crossAxisOffset, LayoutUnit crossAxisExtent, size_t n umberOfChildren, LayoutUnit maxAscent) 47 LineContext(LayoutUnit crossAxisOffset, LayoutUnit crossAxisExtent, size_t n umberOfChildren, LayoutUnit maxAscent)
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 int marginAscent = direction == HorizontalLine ? marginTop() : marginRight() ; 192 int marginAscent = direction == HorizontalLine ? marginTop() : marginRight() ;
193 return synthesizedBaselineFromContentBox(*this, direction) + marginAscent; 193 return synthesizedBaselineFromContentBox(*this, direction) + marginAscent;
194 } 194 }
195 195
196 void LayoutFlexibleBox::removeChild(LayoutObject* child) 196 void LayoutFlexibleBox::removeChild(LayoutObject* child)
197 { 197 {
198 LayoutBlock::removeChild(child); 198 LayoutBlock::removeChild(child);
199 m_intrinsicSizeAlongMainAxis.remove(child); 199 m_intrinsicSizeAlongMainAxis.remove(child);
200 } 200 }
201 201
202 void LayoutFlexibleBox::styleDidChange(StyleDifference diff, const LayoutStyle* oldStyle) 202 void LayoutFlexibleBox::styleDidChange(StyleDifference diff, const ComputedStyle * oldStyle)
203 { 203 {
204 LayoutBlock::styleDidChange(diff, oldStyle); 204 LayoutBlock::styleDidChange(diff, oldStyle);
205 205
206 if (oldStyle && oldStyle->alignItems() == ItemPositionStretch && diff.needsF ullLayout()) { 206 if (oldStyle && oldStyle->alignItems() == ItemPositionStretch && diff.needsF ullLayout()) {
207 // Flex items that were previously stretching need to be relayed out so we can compute new available cross axis space. 207 // Flex items that were previously stretching need to be relayed out so we can compute new available cross axis space.
208 // This is only necessary for stretching since other alignment values do n't change the size of the box. 208 // This is only necessary for stretching since other alignment values do n't change the size of the box.
209 for (LayoutBox* child = firstChildBox(); child; child = child->nextSibli ngBox()) { 209 for (LayoutBox* child = firstChildBox(); child; child = child->nextSibli ngBox()) {
210 ItemPosition previousAlignment = LayoutStyle::resolveAlignment(*oldS tyle, child->styleRef(), ItemPositionStretch); 210 ItemPosition previousAlignment = ComputedStyle::resolveAlignment(*ol dStyle, child->styleRef(), ItemPositionStretch);
211 if (previousAlignment == ItemPositionStretch && previousAlignment != LayoutStyle::resolveAlignment(styleRef(), child->styleRef(), ItemPositionStretc h)) 211 if (previousAlignment == ItemPositionStretch && previousAlignment != ComputedStyle::resolveAlignment(styleRef(), child->styleRef(), ItemPositionStre tch))
212 child->setChildNeedsLayout(MarkOnlyThis); 212 child->setChildNeedsLayout(MarkOnlyThis);
213 } 213 }
214 } 214 }
215 } 215 }
216 216
217 void LayoutFlexibleBox::layoutBlock(bool relayoutChildren) 217 void LayoutFlexibleBox::layoutBlock(bool relayoutChildren)
218 { 218 {
219 ASSERT(needsLayout()); 219 ASSERT(needsLayout());
220 220
221 if (!relayoutChildren && simplifiedLayout()) 221 if (!relayoutChildren && simplifiedLayout())
(...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after
993 LayoutUnit staticBlockPosition = isColumnFlow() ? mainAxisOffset : crossAxis Offset; 993 LayoutUnit staticBlockPosition = isColumnFlow() ? mainAxisOffset : crossAxis Offset;
994 if (childLayer->staticBlockPosition() != staticBlockPosition) { 994 if (childLayer->staticBlockPosition() != staticBlockPosition) {
995 childLayer->setStaticBlockPosition(staticBlockPosition); 995 childLayer->setStaticBlockPosition(staticBlockPosition);
996 if (child.style()->hasStaticBlockPosition(style()->isHorizontalWritingMo de())) 996 if (child.style()->hasStaticBlockPosition(style()->isHorizontalWritingMo de()))
997 child.setChildNeedsLayout(MarkOnlyThis); 997 child.setChildNeedsLayout(MarkOnlyThis);
998 } 998 }
999 } 999 }
1000 1000
1001 ItemPosition LayoutFlexibleBox::alignmentForChild(LayoutBox& child) const 1001 ItemPosition LayoutFlexibleBox::alignmentForChild(LayoutBox& child) const
1002 { 1002 {
1003 ItemPosition align = LayoutStyle::resolveAlignment(styleRef(), child.styleRe f(), ItemPositionStretch); 1003 ItemPosition align = ComputedStyle::resolveAlignment(styleRef(), child.style Ref(), ItemPositionStretch);
1004 1004
1005 if (align == ItemPositionBaseline && hasOrthogonalFlow(child)) 1005 if (align == ItemPositionBaseline && hasOrthogonalFlow(child))
1006 align = ItemPositionFlexStart; 1006 align = ItemPositionFlexStart;
1007 1007
1008 if (style()->flexWrap() == FlexWrapReverse) { 1008 if (style()->flexWrap() == FlexWrapReverse) {
1009 if (align == ItemPositionFlexStart) 1009 if (align == ItemPositionFlexStart)
1010 align = ItemPositionFlexEnd; 1010 align = ItemPositionFlexEnd;
1011 else if (align == ItemPositionFlexEnd) 1011 else if (align == ItemPositionFlexEnd)
1012 align = ItemPositionFlexStart; 1012 align = ItemPositionFlexStart;
1013 } 1013 }
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
1395 ASSERT(child); 1395 ASSERT(child);
1396 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE xtent; 1396 LayoutUnit lineCrossAxisExtent = lineContexts[lineNumber].crossAxisE xtent;
1397 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge; 1397 LayoutUnit originalOffset = lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge;
1398 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi sExtent; 1398 LayoutUnit newOffset = contentExtent - originalOffset - lineCrossAxi sExtent;
1399 adjustAlignmentForChild(*child, newOffset - originalOffset); 1399 adjustAlignmentForChild(*child, newOffset - originalOffset);
1400 } 1400 }
1401 } 1401 }
1402 } 1402 }
1403 1403
1404 } 1404 }
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutFlexibleBox.h ('k') | Source/core/layout/LayoutFrameSet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698