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