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

Side by Side Diff: sky/engine/core/rendering/shapes/ShapeOutsideInfo.cpp

Issue 689743002: First past at removing writing mode. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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) 2012 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2012 Adobe Systems Incorporated. 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 break; 152 break;
153 } 153 }
154 } 154 }
155 155
156 ASSERT(m_shape); 156 ASSERT(m_shape);
157 return *m_shape; 157 return *m_shape;
158 } 158 }
159 159
160 inline LayoutUnit borderBeforeInWritingMode(const RenderBox& renderer, WritingMo de writingMode) 160 inline LayoutUnit borderBeforeInWritingMode(const RenderBox& renderer, WritingMo de writingMode)
161 { 161 {
162 switch (writingMode) { 162 // FIXME(sky): Remove
163 case TopToBottomWritingMode: return renderer.borderTop();
164 case BottomToTopWritingMode: return renderer.borderBottom();
165 case LeftToRightWritingMode: return renderer.borderLeft();
166 case RightToLeftWritingMode: return renderer.borderRight();
167 }
168
169 ASSERT_NOT_REACHED();
170 return renderer.borderBefore(); 163 return renderer.borderBefore();
171 } 164 }
172 165
173 inline LayoutUnit borderAndPaddingBeforeInWritingMode(const RenderBox& renderer, WritingMode writingMode) 166 inline LayoutUnit borderAndPaddingBeforeInWritingMode(const RenderBox& renderer, WritingMode writingMode)
174 { 167 {
175 switch (writingMode) { 168 // FIXME(sky): Remove
176 case TopToBottomWritingMode: return renderer.borderTop() + renderer.paddingT op();
177 case BottomToTopWritingMode: return renderer.borderBottom() + renderer.paddi ngBottom();
178 case LeftToRightWritingMode: return renderer.borderLeft() + renderer.padding Left();
179 case RightToLeftWritingMode: return renderer.borderRight() + renderer.paddin gRight();
180 }
181
182 ASSERT_NOT_REACHED();
183 return renderer.borderAndPaddingBefore(); 169 return renderer.borderAndPaddingBefore();
184 } 170 }
185 171
186 LayoutUnit ShapeOutsideInfo::logicalTopOffset() const 172 LayoutUnit ShapeOutsideInfo::logicalTopOffset() const
187 { 173 {
188 switch (referenceBox(*m_renderer.style()->shapeOutside())) { 174 switch (referenceBox(*m_renderer.style()->shapeOutside())) {
189 case MarginBox: return -m_renderer.marginBefore(m_renderer.containingBlock() ->style()); 175 case MarginBox: return -m_renderer.marginBefore(m_renderer.containingBlock() ->style());
190 case BorderBox: return LayoutUnit(); 176 case BorderBox: return LayoutUnit();
191 case PaddingBox: return borderBeforeInWritingMode(m_renderer, m_renderer.con tainingBlock()->style()->writingMode()); 177 case PaddingBox: return borderBeforeInWritingMode(m_renderer, m_renderer.con tainingBlock()->style()->writingMode());
192 case ContentBox: return borderAndPaddingBeforeInWritingMode(m_renderer, m_re nderer.containingBlock()->style()->writingMode()); 178 case ContentBox: return borderAndPaddingBeforeInWritingMode(m_renderer, m_re nderer.containingBlock()->style()->writingMode());
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 } 308 }
323 309
324 FloatSize ShapeOutsideInfo::shapeToRendererSize(FloatSize size) const 310 FloatSize ShapeOutsideInfo::shapeToRendererSize(FloatSize size) const
325 { 311 {
326 if (!m_renderer.style()->isHorizontalWritingMode()) 312 if (!m_renderer.style()->isHorizontalWritingMode())
327 return size.transposedSize(); 313 return size.transposedSize();
328 return size; 314 return size;
329 } 315 }
330 316
331 } // namespace blink 317 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderFlexibleBox.cpp ('k') | sky/engine/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698