| 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 | 119 |
| 120 struct SameSizeAsLayoutObject : DisplayItemClient { | 120 struct SameSizeAsLayoutObject : DisplayItemClient { |
| 121 virtual ~SameSizeAsLayoutObject() {} // Allocate vtable pointer. | 121 virtual ~SameSizeAsLayoutObject() {} // Allocate vtable pointer. |
| 122 void* pointers[5]; | 122 void* pointers[5]; |
| 123 Member<void*> members[1]; | 123 Member<void*> members[1]; |
| 124 #if ENABLE(ASSERT) | 124 #if ENABLE(ASSERT) |
| 125 unsigned m_debugBitfields : 2; | 125 unsigned m_debugBitfields : 2; |
| 126 #endif | 126 #endif |
| 127 unsigned m_bitfields; | 127 unsigned m_bitfields; |
| 128 unsigned m_bitfields2; | 128 unsigned m_bitfields2; |
| 129 LayoutRect m_previousVisualRect; | 129 LayoutRect m_visualRect; |
| 130 LayoutPoint m_paintOffset; |
| 130 }; | 131 }; |
| 131 | 132 |
| 132 static_assert(sizeof(LayoutObject) == sizeof(SameSizeAsLayoutObject), | 133 static_assert(sizeof(LayoutObject) == sizeof(SameSizeAsLayoutObject), |
| 133 "LayoutObject should stay small"); | 134 "LayoutObject should stay small"); |
| 134 | 135 |
| 135 bool LayoutObject::s_affectsParentBlock = false; | 136 bool LayoutObject::s_affectsParentBlock = false; |
| 136 | 137 |
| 137 // The pointer to paint properties is implemented as a global hash map | 138 // The pointer to paint properties is implemented as a global hash map |
| 138 // temporarily, to avoid memory regression during the transition towards SPv2. | 139 // temporarily, to avoid memory regression during the transition towards SPv2. |
| 139 typedef HashMap<const LayoutObject*, std::unique_ptr<ObjectPaintProperties>> | 140 typedef HashMap<const LayoutObject*, std::unique_ptr<ObjectPaintProperties>> |
| (...skipping 3406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3546 const blink::LayoutObject* root = object1; | 3547 const blink::LayoutObject* root = object1; |
| 3547 while (root->parent()) | 3548 while (root->parent()) |
| 3548 root = root->parent(); | 3549 root = root->parent(); |
| 3549 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); | 3550 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); |
| 3550 } else { | 3551 } else { |
| 3551 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); | 3552 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); |
| 3552 } | 3553 } |
| 3553 } | 3554 } |
| 3554 | 3555 |
| 3555 #endif | 3556 #endif |
| OLD | NEW |