| 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 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 } | 360 } |
| 361 | 361 |
| 362 checkLayoutAttributesConsistency(this, m_layoutAttributes); | 362 checkLayoutAttributesConsistency(this, m_layoutAttributes); |
| 363 | 363 |
| 364 // Reduced version of LayoutBlock::layoutBlock(), which only takes care of S
VG text. | 364 // Reduced version of LayoutBlock::layoutBlock(), which only takes care of S
VG text. |
| 365 // All if branches that could cause early exit in LayoutBlocks layoutBlock()
method are turned into assertions. | 365 // All if branches that could cause early exit in LayoutBlocks layoutBlock()
method are turned into assertions. |
| 366 ASSERT(!isInline()); | 366 ASSERT(!isInline()); |
| 367 ASSERT(!simplifiedLayout()); | 367 ASSERT(!simplifiedLayout()); |
| 368 ASSERT(!scrollsOverflow()); | 368 ASSERT(!scrollsOverflow()); |
| 369 ASSERT(!hasControlClip()); | 369 ASSERT(!hasControlClip()); |
| 370 ASSERT(!hasColumns()); | |
| 371 ASSERT(!positionedObjects()); | 370 ASSERT(!positionedObjects()); |
| 372 ASSERT(!m_overflow); | 371 ASSERT(!m_overflow); |
| 373 ASSERT(!isAnonymousBlock()); | 372 ASSERT(!isAnonymousBlock()); |
| 374 | 373 |
| 375 if (!firstChild()) | 374 if (!firstChild()) |
| 376 setChildrenInline(true); | 375 setChildrenInline(true); |
| 377 | 376 |
| 378 // FIXME: We need to find a way to only layout the child boxes, if needed. | 377 // FIXME: We need to find a way to only layout the child boxes, if needed. |
| 379 FloatRect oldBoundaries = objectBoundingBox(); | 378 FloatRect oldBoundaries = objectBoundingBox(); |
| 380 ASSERT(childrenInline()); | 379 ASSERT(childrenInline()); |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 505 SVGResourcesCache::clientWillBeRemovedFromTree(child); | 504 SVGResourcesCache::clientWillBeRemovedFromTree(child); |
| 506 | 505 |
| 507 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes; | 506 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes; |
| 508 FontCachePurgePreventer fontCachePurgePreventer; | 507 FontCachePurgePreventer fontCachePurgePreventer; |
| 509 subtreeChildWillBeRemoved(child, affectedAttributes); | 508 subtreeChildWillBeRemoved(child, affectedAttributes); |
| 510 LayoutSVGBlock::removeChild(child); | 509 LayoutSVGBlock::removeChild(child); |
| 511 subtreeChildWasRemoved(affectedAttributes); | 510 subtreeChildWasRemoved(affectedAttributes); |
| 512 } | 511 } |
| 513 | 512 |
| 514 } | 513 } |
| OLD | NEW |