| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2007 David Smith (catfish.man@gmail.com) | 4 * (C) 2007 David Smith (catfish.man@gmail.com) |
| 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. |
| 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 startOfContinuations = inlineElementContinuation->node()->layoutObject()
; | 356 startOfContinuations = inlineElementContinuation->node()->layoutObject()
; |
| 357 } else if (LayoutObject* firstChild = block.firstChild()) { | 357 } else if (LayoutObject* firstChild = block.firstChild()) { |
| 358 // This block is the anonymous containing block of an inline element con
tinuation. | 358 // This block is the anonymous containing block of an inline element con
tinuation. |
| 359 if (firstChild->isElementContinuation()) | 359 if (firstChild->isElementContinuation()) |
| 360 startOfContinuations = firstChild->node()->layoutObject(); | 360 startOfContinuations = firstChild->node()->layoutObject(); |
| 361 } | 361 } |
| 362 if (startOfContinuations && startOfContinuations->styleRef().outlineStyleIsA
uto()) | 362 if (startOfContinuations && startOfContinuations->styleRef().outlineStyleIsA
uto()) |
| 363 startOfContinuations->invalidateDisplayItemClient(*startOfContinuations)
; | 363 startOfContinuations->invalidateDisplayItemClient(*startOfContinuations)
; |
| 364 } | 364 } |
| 365 | 365 |
| 366 void LayoutBlock::invalidateDisplayItemClients(const LayoutBoxModelObject& paint
InvalidationContainer, PaintInvalidationReason invalidationReason, const LayoutR
ect& previousPaintInvalidationRect, const LayoutRect& newPaintInvalidationRect)
const | 366 void LayoutBlock::invalidateDisplayItemClients(const LayoutBoxModelObject& paint
InvalidationContainer, PaintInvalidationReason invalidationReason, const LayoutR
ect* paintInvalidationRect) const |
| 367 { | 367 { |
| 368 LayoutBox::invalidateDisplayItemClients(paintInvalidationContainer, invalida
tionReason, previousPaintInvalidationRect, newPaintInvalidationRect); | 368 LayoutBox::invalidateDisplayItemClients(paintInvalidationContainer, invalida
tionReason, paintInvalidationRect); |
| 369 invalidateDisplayItemClientForStartOfContinuationsIfNeeded(*this); | 369 invalidateDisplayItemClientForStartOfContinuationsIfNeeded(*this); |
| 370 } | 370 } |
| 371 | 371 |
| 372 void LayoutBlock::addChildIgnoringContinuation(LayoutObject* newChild, LayoutObj
ect* beforeChild) | 372 void LayoutBlock::addChildIgnoringContinuation(LayoutObject* newChild, LayoutObj
ect* beforeChild) |
| 373 { | 373 { |
| 374 if (beforeChild && beforeChild->parent() != this) { | 374 if (beforeChild && beforeChild->parent() != this) { |
| 375 LayoutObject* beforeChildContainer = beforeChild->parent(); | 375 LayoutObject* beforeChildContainer = beforeChild->parent(); |
| 376 while (beforeChildContainer->parent() != this) | 376 while (beforeChildContainer->parent() != this) |
| 377 beforeChildContainer = beforeChildContainer->parent(); | 377 beforeChildContainer = beforeChildContainer->parent(); |
| 378 ASSERT(beforeChildContainer); | 378 ASSERT(beforeChildContainer); |
| (...skipping 2501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2880 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout
Object* obj) const | 2880 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout
Object* obj) const |
| 2881 { | 2881 { |
| 2882 showLayoutObject(); | 2882 showLayoutObject(); |
| 2883 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 2883 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
| 2884 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 2884 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
| 2885 } | 2885 } |
| 2886 | 2886 |
| 2887 #endif | 2887 #endif |
| 2888 | 2888 |
| 2889 } // namespace blink | 2889 } // namespace blink |
| OLD | NEW |