Chromium Code Reviews| 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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 123 void* pointers[6]; | 123 void* pointers[6]; |
| 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 rect; // Stores the previous paint invalidation rect. | 129 LayoutRect rect; // Stores the previous paint invalidation rect. |
| 130 LayoutPoint position; // Stores the previous position from the paint invalid ation container. | 130 LayoutPoint position; // Stores the previous position from the paint invalid ation container. |
| 131 }; | 131 }; |
| 132 | 132 |
| 133 #if !DCHECK_IS_ON() | |
|
haraken
2016/08/16 13:27:13
Ditto.
keishi
2016/08/17 11:18:28
Done.
| |
| 133 static_assert(sizeof(LayoutObject) == sizeof(SameSizeAsLayoutObject), "LayoutObj ect should stay small"); | 134 static_assert(sizeof(LayoutObject) == sizeof(SameSizeAsLayoutObject), "LayoutObj ect should stay small"); |
| 135 #endif | |
| 134 | 136 |
| 135 bool LayoutObject::s_affectsParentBlock = false; | 137 bool LayoutObject::s_affectsParentBlock = false; |
| 136 | 138 |
| 137 // The pointer to paint properties is implemented as a global hash map temporari ly, | 139 // The pointer to paint properties is implemented as a global hash map temporari ly, |
| 138 // to avoid memory regression during the transition towards SPv2. | 140 // to avoid memory regression during the transition towards SPv2. |
| 139 typedef HashMap<const LayoutObject*, std::unique_ptr<ObjectPaintProperties>> Obj ectPaintPropertiesMap; | 141 typedef HashMap<const LayoutObject*, std::unique_ptr<ObjectPaintProperties>> Obj ectPaintPropertiesMap; |
| 140 static ObjectPaintPropertiesMap& objectPaintPropertiesMap() | 142 static ObjectPaintPropertiesMap& objectPaintPropertiesMap() |
| 141 { | 143 { |
| 142 DEFINE_STATIC_LOCAL(ObjectPaintPropertiesMap, staticObjectPaintPropertiesMap , ()); | 144 DEFINE_STATIC_LOCAL(ObjectPaintPropertiesMap, staticObjectPaintPropertiesMap , ()); |
| 143 return staticObjectPaintPropertiesMap; | 145 return staticObjectPaintPropertiesMap; |
| (...skipping 3338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3482 const blink::LayoutObject* root = object1; | 3484 const blink::LayoutObject* root = object1; |
| 3483 while (root->parent()) | 3485 while (root->parent()) |
| 3484 root = root->parent(); | 3486 root = root->parent(); |
| 3485 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); | 3487 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); |
| 3486 } else { | 3488 } else { |
| 3487 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); | 3489 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); |
| 3488 } | 3490 } |
| 3489 } | 3491 } |
| 3490 | 3492 |
| 3491 #endif | 3493 #endif |
| OLD | NEW |