| 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 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 } | 370 } |
| 371 | 371 |
| 372 checkLayoutAttributesConsistency(this, m_layoutAttributes); | 372 checkLayoutAttributesConsistency(this, m_layoutAttributes); |
| 373 | 373 |
| 374 // Reduced version of RenderBlock::layoutBlock(), which only takes care of S
VG text. | 374 // Reduced version of RenderBlock::layoutBlock(), which only takes care of S
VG text. |
| 375 // All if branches that could cause early exit in RenderBlocks layoutBlock()
method are turned into assertions. | 375 // All if branches that could cause early exit in RenderBlocks layoutBlock()
method are turned into assertions. |
| 376 ASSERT(!isInline()); | 376 ASSERT(!isInline()); |
| 377 ASSERT(!simplifiedLayout()); | 377 ASSERT(!simplifiedLayout()); |
| 378 ASSERT(!scrollsOverflow()); | 378 ASSERT(!scrollsOverflow()); |
| 379 ASSERT(!hasControlClip()); | 379 ASSERT(!hasControlClip()); |
| 380 ASSERT(!hasColumns()); | |
| 381 ASSERT(!positionedObjects()); | 380 ASSERT(!positionedObjects()); |
| 382 ASSERT(!m_overflow); | 381 ASSERT(!m_overflow); |
| 383 ASSERT(!isAnonymousBlock()); | 382 ASSERT(!isAnonymousBlock()); |
| 384 | 383 |
| 385 if (!firstChild()) | 384 if (!firstChild()) |
| 386 setChildrenInline(true); | 385 setChildrenInline(true); |
| 387 | 386 |
| 388 // FIXME: We need to find a way to only layout the child boxes, if needed. | 387 // FIXME: We need to find a way to only layout the child boxes, if needed. |
| 389 FloatRect oldBoundaries = objectBoundingBox(); | 388 FloatRect oldBoundaries = objectBoundingBox(); |
| 390 ASSERT(childrenInline()); | 389 ASSERT(childrenInline()); |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 535 return 0; | 534 return 0; |
| 536 } | 535 } |
| 537 | 536 |
| 538 // Fix for <rdar://problem/8048875>. We should not render :first-letter CSS Styl
e | 537 // Fix for <rdar://problem/8048875>. We should not render :first-letter CSS Styl
e |
| 539 // in a SVG text element context. | 538 // in a SVG text element context. |
| 540 void RenderSVGText::updateFirstLetter() | 539 void RenderSVGText::updateFirstLetter() |
| 541 { | 540 { |
| 542 } | 541 } |
| 543 | 542 |
| 544 } | 543 } |
| OLD | NEW |