| 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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 } | 113 } |
| 114 | 114 |
| 115 LayoutObject::SetLayoutNeededForbiddenScope::~SetLayoutNeededForbiddenScope() | 115 LayoutObject::SetLayoutNeededForbiddenScope::~SetLayoutNeededForbiddenScope() |
| 116 { | 116 { |
| 117 m_layoutObject.setNeedsLayoutIsForbidden(m_preexistingForbidden); | 117 m_layoutObject.setNeedsLayoutIsForbidden(m_preexistingForbidden); |
| 118 } | 118 } |
| 119 #endif | 119 #endif |
| 120 | 120 |
| 121 struct SameSizeAsLayoutObject : DisplayItemClient { | 121 struct SameSizeAsLayoutObject : DisplayItemClient { |
| 122 virtual ~SameSizeAsLayoutObject() { } // Allocate vtable pointer. | 122 virtual ~SameSizeAsLayoutObject() { } // Allocate vtable pointer. |
| 123 void* pointers[6]; | 123 void* pointers[5]; |
| 124 Member<void*> members[1]; |
| 124 #if ENABLE(ASSERT) | 125 #if ENABLE(ASSERT) |
| 125 unsigned m_debugBitfields : 2; | 126 unsigned m_debugBitfields : 2; |
| 126 #endif | 127 #endif |
| 127 unsigned m_bitfields; | 128 unsigned m_bitfields; |
| 128 unsigned m_bitfields2; | 129 unsigned m_bitfields2; |
| 129 LayoutRect rect; // Stores the previous paint invalidation rect. | 130 LayoutRect rect; // Stores the previous paint invalidation rect. |
| 130 LayoutPoint position; // Stores the previous position from the paint invalid
ation container. | 131 LayoutPoint position; // Stores the previous position from the paint invalid
ation container. |
| 131 }; | 132 }; |
| 132 | 133 |
| 133 static_assert(sizeof(LayoutObject) == sizeof(SameSizeAsLayoutObject), "LayoutObj
ect should stay small"); | 134 static_assert(sizeof(LayoutObject) == sizeof(SameSizeAsLayoutObject), "LayoutObj
ect should stay small"); |
| (...skipping 3348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3482 const blink::LayoutObject* root = object1; | 3483 const blink::LayoutObject* root = object1; |
| 3483 while (root->parent()) | 3484 while (root->parent()) |
| 3484 root = root->parent(); | 3485 root = root->parent(); |
| 3485 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); | 3486 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); |
| 3486 } else { | 3487 } else { |
| 3487 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); | 3488 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); |
| 3488 } | 3489 } |
| 3489 } | 3490 } |
| 3490 | 3491 |
| 3491 #endif | 3492 #endif |
| OLD | NEW |