| 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 333 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 344     return extraWidth; | 344     return extraWidth; | 
| 345 } | 345 } | 
| 346 | 346 | 
| 347 inline void BreakingContext::handleOutOfFlowPositioned(Vector<RenderBox*>& posit
     ionedObjects) | 347 inline void BreakingContext::handleOutOfFlowPositioned(Vector<RenderBox*>& posit
     ionedObjects) | 
| 348 { | 348 { | 
| 349     // If our original display wasn't an inline type, then we can | 349     // If our original display wasn't an inline type, then we can | 
| 350     // go ahead and determine our static inline position now. | 350     // go ahead and determine our static inline position now. | 
| 351     RenderBox* box = toRenderBox(m_current.object()); | 351     RenderBox* box = toRenderBox(m_current.object()); | 
| 352     bool isInlineType = box->style()->isOriginalDisplayInlineType(); | 352     bool isInlineType = box->style()->isOriginalDisplayInlineType(); | 
| 353     if (!isInlineType) { | 353     if (!isInlineType) { | 
| 354         m_block->setStaticInlinePositionForChild(box, m_block->logicalHeight(), 
     m_block->startOffsetForContent(m_block->logicalHeight())); | 354         m_block->setStaticInlinePositionForChild(box, m_block->logicalHeight(), 
     m_block->startOffsetForContent()); | 
| 355     } else { | 355     } else { | 
| 356         // If our original display was an INLINE type, then we can go ahead | 356         // If our original display was an INLINE type, then we can go ahead | 
| 357         // and determine our static y position now. | 357         // and determine our static y position now. | 
| 358         box->layer()->setStaticBlockPosition(m_block->logicalHeight()); | 358         box->layer()->setStaticBlockPosition(m_block->logicalHeight()); | 
| 359     } | 359     } | 
| 360 | 360 | 
| 361     // If we're ignoring spaces, we have to stop and include this object and | 361     // If we're ignoring spaces, we have to stop and include this object and | 
| 362     // then start ignoring spaces again. | 362     // then start ignoring spaces again. | 
| 363     if (isInlineType || box->container()->isRenderInline()) { | 363     if (isInlineType || box->container()->isRenderInline()) { | 
| 364         if (m_ignoringSpaces) | 364         if (m_ignoringSpaces) | 
| (...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 951         return IndentText; | 951         return IndentText; | 
| 952     if (isAfterHardLineBreak && style->textIndentLine() == TextIndentEachLine) | 952     if (isAfterHardLineBreak && style->textIndentLine() == TextIndentEachLine) | 
| 953         return IndentText; | 953         return IndentText; | 
| 954 | 954 | 
| 955     return DoNotIndentText; | 955     return DoNotIndentText; | 
| 956 } | 956 } | 
| 957 | 957 | 
| 958 } | 958 } | 
| 959 | 959 | 
| 960 #endif // BreakingContextInlineHeaders_h | 960 #endif // BreakingContextInlineHeaders_h | 
| OLD | NEW | 
|---|