| OLD | NEW |
| 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 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 int adjustmentWidth = verticalScrollbarWidth(); | 262 int adjustmentWidth = verticalScrollbarWidth(); |
| 263 int adjustmentHeight = horizontalScrollbarHeight(); | 263 int adjustmentHeight = horizontalScrollbarHeight(); |
| 264 if (!adjustmentWidth && !adjustmentHeight) | 264 if (!adjustmentWidth && !adjustmentHeight) |
| 265 return size; | 265 return size; |
| 266 | 266 |
| 267 EFlexDirection flexDirection = style()->flexDirection(); | 267 EFlexDirection flexDirection = style()->flexDirection(); |
| 268 TextDirection textDirection = style()->direction(); | 268 TextDirection textDirection = style()->direction(); |
| 269 WritingMode writingMode = style()->getWritingMode(); | 269 WritingMode writingMode = style()->getWritingMode(); |
| 270 | 270 |
| 271 if (flexDirection == FlowRow) { | 271 if (flexDirection == FlowRow) { |
| 272 if (textDirection == RTL) { | 272 if (textDirection == TextDirection::Rtl) { |
| 273 if (writingMode == TopToBottomWritingMode) | 273 if (writingMode == TopToBottomWritingMode) |
| 274 size.expand(adjustmentWidth, 0); | 274 size.expand(adjustmentWidth, 0); |
| 275 else | 275 else |
| 276 size.expand(0, adjustmentHeight); | 276 size.expand(0, adjustmentHeight); |
| 277 } | 277 } |
| 278 if (writingMode == RightToLeftWritingMode) | 278 if (writingMode == RightToLeftWritingMode) |
| 279 size.expand(adjustmentWidth, 0); | 279 size.expand(adjustmentWidth, 0); |
| 280 } else if (flexDirection == FlowRowReverse) { | 280 } else if (flexDirection == FlowRowReverse) { |
| 281 if (textDirection == LTR) { | 281 if (textDirection == TextDirection::Ltr) { |
| 282 if (writingMode == TopToBottomWritingMode) | 282 if (writingMode == TopToBottomWritingMode) |
| 283 size.expand(adjustmentWidth, 0); | 283 size.expand(adjustmentWidth, 0); |
| 284 else | 284 else |
| 285 size.expand(0, adjustmentHeight); | 285 size.expand(0, adjustmentHeight); |
| 286 } | 286 } |
| 287 if (writingMode == RightToLeftWritingMode) | 287 if (writingMode == RightToLeftWritingMode) |
| 288 size.expand(adjustmentWidth, 0); | 288 size.expand(adjustmentWidth, 0); |
| 289 } else if (flexDirection == FlowColumn) { | 289 } else if (flexDirection == FlowColumn) { |
| 290 if (writingMode == RightToLeftWritingMode) | 290 if (writingMode == RightToLeftWritingMode) |
| 291 size.expand(adjustmentWidth, 0); | 291 size.expand(adjustmentWidth, 0); |
| (...skipping 1890 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2182 LayoutUnit originalOffset = | 2182 LayoutUnit originalOffset = |
| 2183 lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge; | 2183 lineContexts[lineNumber].crossAxisOffset - crossAxisStartEdge; |
| 2184 LayoutUnit newOffset = | 2184 LayoutUnit newOffset = |
| 2185 contentExtent - originalOffset - lineCrossAxisExtent; | 2185 contentExtent - originalOffset - lineCrossAxisExtent; |
| 2186 adjustAlignmentForChild(*flexItem.box, newOffset - originalOffset); | 2186 adjustAlignmentForChild(*flexItem.box, newOffset - originalOffset); |
| 2187 } | 2187 } |
| 2188 } | 2188 } |
| 2189 } | 2189 } |
| 2190 | 2190 |
| 2191 } // namespace blink | 2191 } // namespace blink |
| OLD | NEW |