OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. | 2 * Copyright (C) 2013 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 22 matching lines...) Expand all Loading... |
33 #include "core/rendering/RenderBlock.h" | 33 #include "core/rendering/RenderBlock.h" |
34 #include "core/rendering/RenderRubyRun.h" | 34 #include "core/rendering/RenderRubyRun.h" |
35 | 35 |
36 namespace WebCore { | 36 namespace WebCore { |
37 | 37 |
38 LineWidth::LineWidth(RenderBlockFlow& block, bool isFirstLine, IndentTextOrNot s
houldIndentText) | 38 LineWidth::LineWidth(RenderBlockFlow& block, bool isFirstLine, IndentTextOrNot s
houldIndentText) |
39 : m_block(block) | 39 : m_block(block) |
40 , m_uncommittedWidth(0) | 40 , m_uncommittedWidth(0) |
41 , m_committedWidth(0) | 41 , m_committedWidth(0) |
42 , m_overhangWidth(0) | 42 , m_overhangWidth(0) |
| 43 , m_trailingWhitespaceWidth(0) |
43 , m_left(0) | 44 , m_left(0) |
44 , m_right(0) | 45 , m_right(0) |
45 , m_availableWidth(0) | 46 , m_availableWidth(0) |
46 , m_isFirstLine(isFirstLine) | 47 , m_isFirstLine(isFirstLine) |
47 , m_shouldIndentText(shouldIndentText) | 48 , m_shouldIndentText(shouldIndentText) |
48 { | 49 { |
49 updateAvailableWidth(); | 50 updateAvailableWidth(); |
50 } | 51 } |
51 | 52 |
52 void LineWidth::updateAvailableWidth(LayoutUnit replacedHeight) | 53 void LineWidth::updateAvailableWidth(LayoutUnit replacedHeight) |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
204 } | 205 } |
205 updateLineDimension(lastFloatLogicalBottom, newLineWidth, newLineLeft, newLi
neRight); | 206 updateLineDimension(lastFloatLogicalBottom, newLineWidth, newLineLeft, newLi
neRight); |
206 } | 207 } |
207 | 208 |
208 void LineWidth::computeAvailableWidthFromLeftAndRight() | 209 void LineWidth::computeAvailableWidthFromLeftAndRight() |
209 { | 210 { |
210 m_availableWidth = max(0.0f, m_right - m_left) + m_overhangWidth; | 211 m_availableWidth = max(0.0f, m_right - m_left) + m_overhangWidth; |
211 } | 212 } |
212 | 213 |
213 } | 214 } |
OLD | NEW |