| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ight reserved. | 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ight reserved. |
| 4 * Copyright (C) 2010 Google Inc. All rights reserved. | 4 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 5 * Copyright (C) 2013 Adobe Systems Incorporated. | 5 * Copyright (C) 2013 Adobe Systems Incorporated. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 LayoutUnit blockHeight = block->logicalHeight(); | 195 LayoutUnit blockHeight = block->logicalHeight(); |
| 196 if (containerBlock->isRenderInline()) { | 196 if (containerBlock->isRenderInline()) { |
| 197 // A relative positioned inline encloses us. In this case, we also have
to determine our | 197 // A relative positioned inline encloses us. In this case, we also have
to determine our |
| 198 // position as though we were an inline. Set |staticInlinePosition| and
|staticBlockPosition| on the relative positioned | 198 // position as though we were an inline. Set |staticInlinePosition| and
|staticBlockPosition| on the relative positioned |
| 199 // inline so that we can obtain the value later. | 199 // inline so that we can obtain the value later. |
| 200 toRenderInline(containerBlock)->layer()->setStaticInlinePosition(block->
startAlignedOffsetForLine(blockHeight, false)); | 200 toRenderInline(containerBlock)->layer()->setStaticInlinePosition(block->
startAlignedOffsetForLine(blockHeight, false)); |
| 201 toRenderInline(containerBlock)->layer()->setStaticBlockPosition(blockHei
ght); | 201 toRenderInline(containerBlock)->layer()->setStaticBlockPosition(blockHei
ght); |
| 202 | 202 |
| 203 // If |child| is a leading or trailing positioned object this is its onl
y opportunity to ensure it moves with an inline | 203 // If |child| is a leading or trailing positioned object this is its onl
y opportunity to ensure it moves with an inline |
| 204 // container changing width. | 204 // container changing width. |
| 205 child->moveWithEdgeOfInlineContainerIfNecessary(child->isHorizontalWriti
ngMode()); | 205 child->moveWithEdgeOfInlineContainerIfNecessary(); |
| 206 } | 206 } |
| 207 block->updateStaticInlinePositionForChild(child, blockHeight); | 207 block->updateStaticInlinePositionForChild(child, blockHeight); |
| 208 child->layer()->setStaticBlockPosition(blockHeight); | 208 child->layer()->setStaticBlockPosition(blockHeight); |
| 209 } | 209 } |
| 210 | 210 |
| 211 // FIXME: The entire concept of the skipTrailingWhitespace function is flawed, s
ince we really need to be building | 211 // FIXME: The entire concept of the skipTrailingWhitespace function is flawed, s
ince we really need to be building |
| 212 // line boxes even for containers that may ultimately collapse away. Otherwise w
e'll never get positioned | 212 // line boxes even for containers that may ultimately collapse away. Otherwise w
e'll never get positioned |
| 213 // elements quite right. In other words, we need to build this function's work i
nto the normal line | 213 // elements quite right. In other words, we need to build this function's work i
nto the normal line |
| 214 // object iteration process. | 214 // object iteration process. |
| 215 // NB. this function will insert any floating elements that would otherwise | 215 // NB. this function will insert any floating elements that would otherwise |
| (...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 837 | 837 |
| 838 if (style->textIndentType() == TextIndentHanging) | 838 if (style->textIndentType() == TextIndentHanging) |
| 839 shouldIndentText = shouldIndentText == IndentText ? DoNotIndentText : In
dentText; | 839 shouldIndentText = shouldIndentText == IndentText ? DoNotIndentText : In
dentText; |
| 840 | 840 |
| 841 return shouldIndentText; | 841 return shouldIndentText; |
| 842 } | 842 } |
| 843 | 843 |
| 844 } | 844 } |
| 845 | 845 |
| 846 #endif // BreakingContextInlineHeaders_h | 846 #endif // BreakingContextInlineHeaders_h |
| OLD | NEW |