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. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. |
7 * All rights reserved. | 7 * All rights reserved. |
8 * Copyright (C) 2009 Google Inc. All rights reserved. | 8 * Copyright (C) 2009 Google Inc. All rights reserved. |
9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. | 9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. |
10 * (http://www.torchmobile.com/) | 10 * (http://www.torchmobile.com/) |
(...skipping 3128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3139 return 0; | 3139 return 0; |
3140 } | 3140 } |
3141 | 3141 |
3142 bool LayoutObject::isInert() const { | 3142 bool LayoutObject::isInert() const { |
3143 const LayoutObject* layoutObject = this; | 3143 const LayoutObject* layoutObject = this; |
3144 while (!layoutObject->node()) | 3144 while (!layoutObject->node()) |
3145 layoutObject = layoutObject->parent(); | 3145 layoutObject = layoutObject->parent(); |
3146 return layoutObject->node()->isInert(); | 3146 return layoutObject->node()->isInert(); |
3147 } | 3147 } |
3148 | 3148 |
3149 void LayoutObject::imageChanged(ImageResource* image, const IntRect* rect) { | 3149 void LayoutObject::imageChanged(ImageResourceContent* image, |
| 3150 const IntRect* rect) { |
3150 ASSERT(m_node); | 3151 ASSERT(m_node); |
3151 | 3152 |
3152 // Image change notifications should not be received during paint because | 3153 // Image change notifications should not be received during paint because |
3153 // the resulting invalidations will be cleared following paint. This can also | 3154 // the resulting invalidations will be cleared following paint. This can also |
3154 // lead to modifying the tree out from under paint(), see: crbug.com/616700. | 3155 // lead to modifying the tree out from under paint(), see: crbug.com/616700. |
3155 DCHECK(document().lifecycle().state() != | 3156 DCHECK(document().lifecycle().state() != |
3156 DocumentLifecycle::LifecycleState::InPaint); | 3157 DocumentLifecycle::LifecycleState::InPaint); |
3157 | 3158 |
3158 imageChanged(static_cast<WrappedImagePtr>(image), rect); | 3159 imageChanged(static_cast<WrappedImagePtr>(image), rect); |
3159 } | 3160 } |
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3508 const blink::LayoutObject* root = object1; | 3509 const blink::LayoutObject* root = object1; |
3509 while (root->parent()) | 3510 while (root->parent()) |
3510 root = root->parent(); | 3511 root = root->parent(); |
3511 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); | 3512 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); |
3512 } else { | 3513 } else { |
3513 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); | 3514 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); |
3514 } | 3515 } |
3515 } | 3516 } |
3516 | 3517 |
3517 #endif | 3518 #endif |
OLD | NEW |