| 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 } | 109 } |
| 110 #endif | 110 #endif |
| 111 | 111 |
| 112 struct SameSizeAsRenderObject { | 112 struct SameSizeAsRenderObject { |
| 113 virtual ~SameSizeAsRenderObject() { } // Allocate vtable pointer. | 113 virtual ~SameSizeAsRenderObject() { } // Allocate vtable pointer. |
| 114 void* pointers[5]; | 114 void* pointers[5]; |
| 115 #ifndef NDEBUG | 115 #ifndef NDEBUG |
| 116 unsigned m_debugBitfields : 2; | 116 unsigned m_debugBitfields : 2; |
| 117 #endif | 117 #endif |
| 118 unsigned m_bitfields; | 118 unsigned m_bitfields; |
| 119 LayoutRect m_dummyRectThatShouldntStickInTree1; |
| 120 LayoutRect m_dummyRectThatShouldntStickInTree2; |
| 119 }; | 121 }; |
| 120 | 122 |
| 121 COMPILE_ASSERT(sizeof(RenderObject) == sizeof(SameSizeAsRenderObject), RenderObj
ect_should_stay_small); | 123 COMPILE_ASSERT(sizeof(RenderObject) == sizeof(SameSizeAsRenderObject), RenderObj
ect_should_stay_small); |
| 122 | 124 |
| 123 bool RenderObject::s_affectsParentBlock = false; | 125 bool RenderObject::s_affectsParentBlock = false; |
| 124 | 126 |
| 125 RenderObjectAncestorLineboxDirtySet* RenderObject::s_ancestorLineboxDirtySet = 0
; | 127 RenderObjectAncestorLineboxDirtySet* RenderObject::s_ancestorLineboxDirtySet = 0
; |
| 126 | 128 |
| 127 void* RenderObject::operator new(size_t sz) | 129 void* RenderObject::operator new(size_t sz) |
| 128 { | 130 { |
| (...skipping 3263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3392 { | 3394 { |
| 3393 if (object1) { | 3395 if (object1) { |
| 3394 const WebCore::RenderObject* root = object1; | 3396 const WebCore::RenderObject* root = object1; |
| 3395 while (root->parent()) | 3397 while (root->parent()) |
| 3396 root = root->parent(); | 3398 root = root->parent(); |
| 3397 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3399 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 3398 } | 3400 } |
| 3399 } | 3401 } |
| 3400 | 3402 |
| 3401 #endif | 3403 #endif |
| OLD | NEW |