| 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) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) | 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv
ed. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv
ed. |
| 7 * Copyright (C) 2009 Google Inc. All rights reserved. | 7 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) |
| 9 * | 9 * |
| 10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
| (...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 return 0; | 433 return 0; |
| 434 } | 434 } |
| 435 | 435 |
| 436 bool RenderObject::skipInvalidationWhenLaidOutChildren() const | 436 bool RenderObject::skipInvalidationWhenLaidOutChildren() const |
| 437 { | 437 { |
| 438 if (!neededLayoutBecauseOfChildren()) | 438 if (!neededLayoutBecauseOfChildren()) |
| 439 return false; | 439 return false; |
| 440 | 440 |
| 441 // SVG renderers need to be invalidated when their children are laid out. | 441 // SVG renderers need to be invalidated when their children are laid out. |
| 442 // RenderBlocks with line boxes are responsible to invalidate them so we can
't ignore them. | 442 // RenderBlocks with line boxes are responsible to invalidate them so we can
't ignore them. |
| 443 if (isRenderBlockFlow() && toRenderBlockFlow(this)->firstLineBox()) | 443 if (isRenderParagraph() && toRenderParagraph(this)->firstLineBox()) |
| 444 return false; | 444 return false; |
| 445 | 445 |
| 446 return rendererHasNoBoxEffect(); | 446 return rendererHasNoBoxEffect(); |
| 447 } | 447 } |
| 448 | 448 |
| 449 RenderBlock* RenderObject::firstLineBlock() const | 449 RenderBlock* RenderObject::firstLineBlock() const |
| 450 { | 450 { |
| 451 return 0; | 451 return 0; |
| 452 } | 452 } |
| 453 | 453 |
| (...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1232 void RenderObject::styleWillChange(StyleDifference diff, const RenderStyle& newS
tyle) | 1232 void RenderObject::styleWillChange(StyleDifference diff, const RenderStyle& newS
tyle) |
| 1233 { | 1233 { |
| 1234 if (m_style) { | 1234 if (m_style) { |
| 1235 if (isOutOfFlowPositioned() && (m_style->position() != newStyle.position
())) | 1235 if (isOutOfFlowPositioned() && (m_style->position() != newStyle.position
())) |
| 1236 // For changes in positioning styles, we need to conceivably remove
ourselves | 1236 // For changes in positioning styles, we need to conceivably remove
ourselves |
| 1237 // from the positioned objects list. | 1237 // from the positioned objects list. |
| 1238 toRenderBox(this)->removeFloatingOrPositionedChildFromBlockLists(); | 1238 toRenderBox(this)->removeFloatingOrPositionedChildFromBlockLists(); |
| 1239 | 1239 |
| 1240 s_affectsParentBlock = isFloatingOrOutOfFlowPositioned() | 1240 s_affectsParentBlock = isFloatingOrOutOfFlowPositioned() |
| 1241 && !newStyle.hasOutOfFlowPosition() | 1241 && !newStyle.hasOutOfFlowPosition() |
| 1242 && parent() && (parent()->isRenderBlockFlow() || parent()->isRenderI
nline()); | 1242 && parent() && (parent()->isRenderParagraph() || parent()->isRenderI
nline()); |
| 1243 | 1243 |
| 1244 // Clearing these bits is required to avoid leaving stale renderers. | 1244 // Clearing these bits is required to avoid leaving stale renderers. |
| 1245 // FIXME: We shouldn't need that hack if our logic was totally correct. | 1245 // FIXME: We shouldn't need that hack if our logic was totally correct. |
| 1246 if (diff.needsLayout()) { | 1246 if (diff.needsLayout()) { |
| 1247 clearPositionedState(); | 1247 clearPositionedState(); |
| 1248 } | 1248 } |
| 1249 } else { | 1249 } else { |
| 1250 s_affectsParentBlock = false; | 1250 s_affectsParentBlock = false; |
| 1251 } | 1251 } |
| 1252 } | 1252 } |
| (...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1969 { | 1969 { |
| 1970 if (object1) { | 1970 if (object1) { |
| 1971 const blink::RenderObject* root = object1; | 1971 const blink::RenderObject* root = object1; |
| 1972 while (root->parent()) | 1972 while (root->parent()) |
| 1973 root = root->parent(); | 1973 root = root->parent(); |
| 1974 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 1974 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 1975 } | 1975 } |
| 1976 } | 1976 } |
| 1977 | 1977 |
| 1978 #endif | 1978 #endif |
| OLD | NEW |