| 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 }; | 117 }; |
| 118 | 118 |
| 119 COMPILE_ASSERT(sizeof(RenderObject) == sizeof(SameSizeAsRenderObject), RenderObj
ect_should_stay_small); | 119 COMPILE_ASSERT(sizeof(RenderObject) == sizeof(SameSizeAsRenderObject), RenderObj
ect_should_stay_small); |
| 120 | 120 |
| 121 bool RenderObject::s_affectsParentBlock = false; | 121 bool RenderObject::s_affectsParentBlock = false; |
| 122 | 122 |
| 123 RenderObjectAncestorLineboxDirtySet* RenderObject::s_ancestorLineboxDirtySet = 0
; | 123 RenderObjectAncestorLineboxDirtySet* RenderObject::s_ancestorLineboxDirtySet = 0
; |
| 124 | 124 |
| 125 void* RenderObject::operator new(size_t sz) | 125 void* RenderObject::operator new(size_t sz) |
| 126 { | 126 { |
| 127 ASSERT(isMainThread()); |
| 127 return partitionAlloc(Partitions::getRenderingPartition(), sz); | 128 return partitionAlloc(Partitions::getRenderingPartition(), sz); |
| 128 } | 129 } |
| 129 | 130 |
| 130 void RenderObject::operator delete(void* ptr) | 131 void RenderObject::operator delete(void* ptr) |
| 131 { | 132 { |
| 133 ASSERT(isMainThread()); |
| 132 partitionFree(ptr); | 134 partitionFree(ptr); |
| 133 } | 135 } |
| 134 | 136 |
| 135 RenderObject* RenderObject::createObject(Element* element, RenderStyle* style) | 137 RenderObject* RenderObject::createObject(Element* element, RenderStyle* style) |
| 136 { | 138 { |
| 137 Document* doc = element->document(); | 139 Document* doc = element->document(); |
| 138 | 140 |
| 139 // Minimal support for content properties replacing an entire element. | 141 // Minimal support for content properties replacing an entire element. |
| 140 // Works only if we have exactly one piece of content and it's a URL. | 142 // Works only if we have exactly one piece of content and it's a URL. |
| 141 // Otherwise acts as if we didn't support this feature. | 143 // Otherwise acts as if we didn't support this feature. |
| (...skipping 3169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3311 { | 3313 { |
| 3312 if (object1) { | 3314 if (object1) { |
| 3313 const WebCore::RenderObject* root = object1; | 3315 const WebCore::RenderObject* root = object1; |
| 3314 while (root->parent()) | 3316 while (root->parent()) |
| 3315 root = root->parent(); | 3317 root = root->parent(); |
| 3316 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3318 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 3317 } | 3319 } |
| 3318 } | 3320 } |
| 3319 | 3321 |
| 3320 #endif | 3322 #endif |
| OLD | NEW |