| 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 1823 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1834 // style changing, since it depends on whether we decide to composite these
elements. When the | 1834 // style changing, since it depends on whether we decide to composite these
elements. When the |
| 1835 // layer status of one of these elements changes, we need to force a layout. | 1835 // layer status of one of these elements changes, we need to force a layout. |
| 1836 if (!diff.needsFullLayout() && style() && isBoxModelObject()) { | 1836 if (!diff.needsFullLayout() && style() && isBoxModelObject()) { |
| 1837 bool requiresLayer = toLayoutBoxModelObject(this)->layerTypeRequired() !
= NoPaintLayer; | 1837 bool requiresLayer = toLayoutBoxModelObject(this)->layerTypeRequired() !
= NoPaintLayer; |
| 1838 if (hasLayer() != requiresLayer) | 1838 if (hasLayer() != requiresLayer) |
| 1839 diff.setNeedsFullLayout(); | 1839 diff.setNeedsFullLayout(); |
| 1840 } | 1840 } |
| 1841 | 1841 |
| 1842 // If we have no layer(), just treat a PaintInvalidationLayer hint as a norm
al paint invalidation. | 1842 // If we have no layer(), just treat a PaintInvalidationLayer hint as a norm
al paint invalidation. |
| 1843 if (diff.needsPaintInvalidationLayer() && !hasLayer()) { | 1843 if (diff.needsPaintInvalidationLayer() && !hasLayer()) { |
| 1844 ASSERT_NOT_REACHED(); |
| 1844 diff.clearNeedsPaintInvalidation(); | 1845 diff.clearNeedsPaintInvalidation(); |
| 1845 diff.setNeedsPaintInvalidationObject(); | 1846 diff.setNeedsPaintInvalidationObject(); |
| 1846 } | 1847 } |
| 1847 | 1848 |
| 1848 return diff; | 1849 return diff; |
| 1849 } | 1850 } |
| 1850 | 1851 |
| 1851 void LayoutObject::setPseudoStyle(PassRefPtr<ComputedStyle> pseudoStyle) | 1852 void LayoutObject::setPseudoStyle(PassRefPtr<ComputedStyle> pseudoStyle) |
| 1852 { | 1853 { |
| 1853 ASSERT(pseudoStyle->styleType() == PseudoIdBefore || pseudoStyle->styleType(
) == PseudoIdAfter || pseudoStyle->styleType() == PseudoIdFirstLetter); | 1854 ASSERT(pseudoStyle->styleType() == PseudoIdBefore || pseudoStyle->styleType(
) == PseudoIdAfter || pseudoStyle->styleType() == PseudoIdFirstLetter); |
| (...skipping 1845 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3699 const blink::LayoutObject* root = object1; | 3700 const blink::LayoutObject* root = object1; |
| 3700 while (root->parent()) | 3701 while (root->parent()) |
| 3701 root = root->parent(); | 3702 root = root->parent(); |
| 3702 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); | 3703 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); |
| 3703 } else { | 3704 } else { |
| 3704 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n"); | 3705 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n"); |
| 3705 } | 3706 } |
| 3706 } | 3707 } |
| 3707 | 3708 |
| 3708 #endif | 3709 #endif |
| OLD | NEW |