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

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

Issue 815833005: [css-grid] Handle min-content/max-content with orthogonal flows (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch rebased and applied the suggested changes. Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1118 if (newLeft != box->logicalLeft()) 1118 if (newLeft != box->logicalLeft())
1119 layoutScope.setChildNeedsLayout(child); 1119 layoutScope.setChildNeedsLayout(child);
1120 } else if (hasStaticBlockPosition) { 1120 } else if (hasStaticBlockPosition) {
1121 LayoutUnit oldTop = box->logicalTop(); 1121 LayoutUnit oldTop = box->logicalTop();
1122 box->updateLogicalHeight(); 1122 box->updateLogicalHeight();
1123 if (box->logicalTop() != oldTop) 1123 if (box->logicalTop() != oldTop)
1124 layoutScope.setChildNeedsLayout(child); 1124 layoutScope.setChildNeedsLayout(child);
1125 } 1125 }
1126 } 1126 }
1127 1127
1128 LayoutUnit LayoutBlock::marginIntrinsicLogicalWidthForChild(LayoutBox& child) co nst 1128 LayoutUnit LayoutBlock::marginIntrinsicLogicalWidthForChild(const LayoutBox& chi ld) const
svillar 2016/04/14 08:58:41 I know I've already said this, but this is not a g
cbiesinger 2016/04/14 16:31:18 Why? This change seems like a good thing regardles
svillar 2016/04/15 12:51:01 As I said privately, the change seems good as the
1129 { 1129 {
1130 // A margin has three types: fixed, percentage, and auto (variable). 1130 // A margin has three types: fixed, percentage, and auto (variable).
1131 // Auto and percentage margins become 0 when computing min/max width. 1131 // Auto and percentage margins become 0 when computing min/max width.
1132 // Fixed margins can be added in as is. 1132 // Fixed margins can be added in as is.
1133 Length marginLeft = child.style()->marginStartUsing(style()); 1133 Length marginLeft = child.style()->marginStartUsing(style());
1134 Length marginRight = child.style()->marginEndUsing(style()); 1134 Length marginRight = child.style()->marginEndUsing(style());
1135 LayoutUnit margin; 1135 LayoutUnit margin;
1136 if (marginLeft.isFixed()) 1136 if (marginLeft.isFixed())
1137 margin += marginLeft.value(); 1137 margin += marginLeft.value();
1138 if (marginRight.isFixed()) 1138 if (marginRight.isFixed())
(...skipping 1687 matching lines...) Expand 10 before | Expand all | Expand 10 after
2826 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const 2826 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const
2827 { 2827 {
2828 showLayoutObject(); 2828 showLayoutObject();
2829 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2829 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2830 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2830 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2831 } 2831 }
2832 2832
2833 #endif 2833 #endif
2834 2834
2835 } // namespace blink 2835 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698