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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 #ifndef NDEBUG | 94 #ifndef NDEBUG |
95 unsigned m_debugBitfields : 2; | 95 unsigned m_debugBitfields : 2; |
96 #endif | 96 #endif |
97 unsigned m_bitfields; | 97 unsigned m_bitfields; |
98 }; | 98 }; |
99 | 99 |
100 COMPILE_ASSERT(sizeof(RenderObject) == sizeof(SameSizeAsRenderObject), RenderObj
ect_should_stay_small); | 100 COMPILE_ASSERT(sizeof(RenderObject) == sizeof(SameSizeAsRenderObject), RenderObj
ect_should_stay_small); |
101 | 101 |
102 bool RenderObject::s_affectsParentBlock = false; | 102 bool RenderObject::s_affectsParentBlock = false; |
103 | 103 |
| 104 RenderObjectAncestorLineboxDirtySet* RenderObject::s_ancestorLineboxDirtySet = 0
; |
| 105 |
104 void* RenderObject::operator new(size_t sz, RenderArena* renderArena) | 106 void* RenderObject::operator new(size_t sz, RenderArena* renderArena) |
105 { | 107 { |
106 return renderArena->allocate(sz); | 108 return renderArena->allocate(sz); |
107 } | 109 } |
108 | 110 |
109 void RenderObject::operator delete(void* ptr, size_t sz) | 111 void RenderObject::operator delete(void* ptr, size_t sz) |
110 { | 112 { |
111 ASSERT(baseOfRenderObjectBeingDeleted == ptr); | 113 ASSERT(baseOfRenderObjectBeingDeleted == ptr); |
112 | 114 |
113 // Stash size where destroy can find it. | 115 // Stash size where destroy can find it. |
(...skipping 2159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2273 if (hasCounterNodeMap()) | 2275 if (hasCounterNodeMap()) |
2274 RenderCounter::destroyCounterNodes(this); | 2276 RenderCounter::destroyCounterNodes(this); |
2275 | 2277 |
2276 // FIXME: Would like to do this in RenderBoxModelObject, but the timing is s
o complicated that this can't easily | 2278 // FIXME: Would like to do this in RenderBoxModelObject, but the timing is s
o complicated that this can't easily |
2277 // be moved into RenderBoxModelObject::destroy. | 2279 // be moved into RenderBoxModelObject::destroy. |
2278 if (hasLayer()) { | 2280 if (hasLayer()) { |
2279 setHasLayer(false); | 2281 setHasLayer(false); |
2280 toRenderBoxModelObject(this)->destroyLayer(); | 2282 toRenderBoxModelObject(this)->destroyLayer(); |
2281 } | 2283 } |
2282 | 2284 |
| 2285 setAncestorLineBoxDirty(false); |
| 2286 |
2283 clearLayoutRootIfNeeded(); | 2287 clearLayoutRootIfNeeded(); |
2284 } | 2288 } |
2285 | 2289 |
2286 void RenderObject::destroyAndCleanupAnonymousWrappers() | 2290 void RenderObject::destroyAndCleanupAnonymousWrappers() |
2287 { | 2291 { |
2288 RenderObject* parent = this->parent(); | 2292 RenderObject* parent = this->parent(); |
2289 | 2293 |
2290 // If the tree is destroyed or our parent is not anonymous, there is no need
for a clean-up phase. | 2294 // If the tree is destroyed or our parent is not anonymous, there is no need
for a clean-up phase. |
2291 if (documentBeingDestroyed() || !parent || !parent->isAnonymous()) { | 2295 if (documentBeingDestroyed() || !parent || !parent->isAnonymous()) { |
2292 destroy(); | 2296 destroy(); |
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2888 { | 2892 { |
2889 if (object1) { | 2893 if (object1) { |
2890 const WebCore::RenderObject* root = object1; | 2894 const WebCore::RenderObject* root = object1; |
2891 while (root->parent()) | 2895 while (root->parent()) |
2892 root = root->parent(); | 2896 root = root->parent(); |
2893 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 2897 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
2894 } | 2898 } |
2895 } | 2899 } |
2896 | 2900 |
2897 #endif | 2901 #endif |
OLD | NEW |