| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Apple Computer, Inc. | 2 * Copyright (C) 2006 Apple Computer, Inc. |
| 3 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org> | 3 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org> |
| 4 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> | 4 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> |
| 5 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> | 5 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> |
| 6 * Copyright (C) 2008 Rob Buis <buis@kde.org> | 6 * Copyright (C) 2008 Rob Buis <buis@kde.org> |
| 7 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> | 7 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> |
| 8 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved. | 8 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved. |
| 9 * Copyright (C) 2012 Google Inc. | 9 * Copyright (C) 2012 Google Inc. |
| 10 * | 10 * |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 FloatRect oldBoundaries = objectBoundingBox(); | 240 FloatRect oldBoundaries = objectBoundingBox(); |
| 241 ASSERT(childrenInline()); | 241 ASSERT(childrenInline()); |
| 242 | 242 |
| 243 rebuildFloatsFromIntruding(); | 243 rebuildFloatsFromIntruding(); |
| 244 | 244 |
| 245 LayoutUnit beforeEdge = borderBefore() + paddingBefore(); | 245 LayoutUnit beforeEdge = borderBefore() + paddingBefore(); |
| 246 LayoutUnit afterEdge = borderAfter() + paddingAfter() + scrollbarLogicalHeig
ht(); | 246 LayoutUnit afterEdge = borderAfter() + paddingAfter() + scrollbarLogicalHeig
ht(); |
| 247 setLogicalHeight(beforeEdge); | 247 setLogicalHeight(beforeEdge); |
| 248 | 248 |
| 249 LayoutState state(*this, locationOffset()); | 249 LayoutState state(*this, locationOffset()); |
| 250 LayoutUnit paintInvalidationLogicalTop; | 250 layoutInlineChildren(true, afterEdge); |
| 251 LayoutUnit paintInvalidationLogicalBottom; | |
| 252 layoutInlineChildren(true, paintInvalidationLogicalTop, paintInvalidationLog
icalBottom, afterEdge); | |
| 253 | 251 |
| 254 m_needsReordering = false; | 252 m_needsReordering = false; |
| 255 | 253 |
| 256 // If we don't have any line boxes, then make sure the frame rect is still c
leared. | 254 // If we don't have any line boxes, then make sure the frame rect is still c
leared. |
| 257 if (!firstLineBox()) | 255 if (!firstLineBox()) |
| 258 setFrameRect(LayoutRect()); | 256 setFrameRect(LayoutRect()); |
| 259 | 257 |
| 260 m_overflow.reset(); | 258 m_overflow.reset(); |
| 261 addVisualEffectOverflow(); | 259 addVisualEffectOverflow(); |
| 262 | 260 |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 } | 393 } |
| 396 | 394 |
| 397 void LayoutSVGText::invalidateTreeIfNeeded(const PaintInvalidationState& paintIn
validationState) | 395 void LayoutSVGText::invalidateTreeIfNeeded(const PaintInvalidationState& paintIn
validationState) |
| 398 { | 396 { |
| 399 // TODO(wangxianzhu): Verify if the inherited LayoutBoxModelObject::invalida
teTreeIfNeeded() | 397 // TODO(wangxianzhu): Verify if the inherited LayoutBoxModelObject::invalida
teTreeIfNeeded() |
| 400 // is applicable here. If yes, remove this overriding method. | 398 // is applicable here. If yes, remove this overriding method. |
| 401 LayoutObject::invalidateTreeIfNeeded(paintInvalidationState); | 399 LayoutObject::invalidateTreeIfNeeded(paintInvalidationState); |
| 402 } | 400 } |
| 403 | 401 |
| 404 } // namespace blink | 402 } // namespace blink |
| OLD | NEW |