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

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

Issue 842193004: [css-grid] Handle alignment with orthogonal flows (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@orthogonal-flows
Patch Set: Added the TODO comment suggested. Created 4 years, 5 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) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1123 matching lines...) Expand 10 before | Expand all | Expand 10 after
1134 gOverrideContainingBlockLogicalWidthMap->remove(this); 1134 gOverrideContainingBlockLogicalWidthMap->remove(this);
1135 clearOverrideContainingBlockContentLogicalHeight(); 1135 clearOverrideContainingBlockContentLogicalHeight();
1136 } 1136 }
1137 1137
1138 void LayoutBox::clearOverrideContainingBlockContentLogicalHeight() 1138 void LayoutBox::clearOverrideContainingBlockContentLogicalHeight()
1139 { 1139 {
1140 if (gOverrideContainingBlockLogicalHeightMap) 1140 if (gOverrideContainingBlockLogicalHeightMap)
1141 gOverrideContainingBlockLogicalHeightMap->remove(this); 1141 gOverrideContainingBlockLogicalHeightMap->remove(this);
1142 } 1142 }
1143 1143
1144 LayoutUnit LayoutBox::overrideContainingBlockContentWidth() const
cbiesinger 2016/07/19 17:39:36 By the way, I wonder if we should store the overri
svillar 2016/07/20 09:23:36 FWIW I agree with Christian.
jfernandez 2016/07/20 13:46:14 I think it'd make sense, so I'll add a TODO about
1145 {
1146 return containingBlock()->isHorizontalWritingMode() ? overrideContainingBloc kContentLogicalWidth() : overrideContainingBlockContentLogicalHeight();
1147 }
1148
1149 LayoutUnit LayoutBox::overrideContainingBlockContentHeight() const
1150 {
1151 return containingBlock()->isHorizontalWritingMode() ? overrideContainingBloc kContentLogicalHeight() : overrideContainingBlockContentLogicalWidth();
1152 }
1153
1154 bool LayoutBox::hasOverrideContainingBlockWidth() const
1155 {
1156 return containingBlock()->isHorizontalWritingMode() ? hasOverrideContainingB lockLogicalWidth() : hasOverrideContainingBlockLogicalHeight();
1157 }
1158
1159 bool LayoutBox::hasOverrideContainingBlockHeight() const
1160 {
1161 return containingBlock()->isHorizontalWritingMode() ? hasOverrideContainingB lockLogicalHeight() : hasOverrideContainingBlockLogicalWidth();
1162 }
1163
1144 LayoutUnit LayoutBox::extraInlineOffset() const 1164 LayoutUnit LayoutBox::extraInlineOffset() const
1145 { 1165 {
1146 return gExtraInlineOffsetMap ? gExtraInlineOffsetMap->get(this) : LayoutUnit (); 1166 return gExtraInlineOffsetMap ? gExtraInlineOffsetMap->get(this) : LayoutUnit ();
1147 } 1167 }
1148 1168
1149 LayoutUnit LayoutBox::extraBlockOffset() const 1169 LayoutUnit LayoutBox::extraBlockOffset() const
1150 { 1170 {
1151 return gExtraBlockOffsetMap ? gExtraBlockOffsetMap->get(this) : LayoutUnit() ; 1171 return gExtraBlockOffsetMap ? gExtraBlockOffsetMap->get(this) : LayoutUnit() ;
1152 } 1172 }
1153 1173
(...skipping 3772 matching lines...) Expand 10 before | Expand all | Expand 10 after
4926 m_rareData->m_snapAreas->remove(&snapArea); 4946 m_rareData->m_snapAreas->remove(&snapArea);
4927 } 4947 }
4928 } 4948 }
4929 4949
4930 SnapAreaSet* LayoutBox::snapAreas() const 4950 SnapAreaSet* LayoutBox::snapAreas() const
4931 { 4951 {
4932 return m_rareData ? m_rareData->m_snapAreas.get() : nullptr; 4952 return m_rareData ? m_rareData->m_snapAreas.get() : nullptr;
4933 } 4953 }
4934 4954
4935 } // namespace blink 4955 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698