| 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 struct SameSizeAsRenderObject { | 92 struct SameSizeAsRenderObject { |
| 93 virtual ~SameSizeAsRenderObject() { } // Allocate vtable pointer. | 93 virtual ~SameSizeAsRenderObject() { } // Allocate vtable pointer. |
| 94 void* pointers[5]; | 94 void* pointers[5]; |
| 95 #if ENABLE(ASSERT) | 95 #if ENABLE(ASSERT) |
| 96 unsigned m_debugBitfields : 2; | 96 unsigned m_debugBitfields : 2; |
| 97 #if ENABLE(OILPAN) | 97 #if ENABLE(OILPAN) |
| 98 unsigned m_oilpanBitfields : 1; | 98 unsigned m_oilpanBitfields : 1; |
| 99 #endif | 99 #endif |
| 100 #endif | 100 #endif |
| 101 unsigned m_bitfields; | 101 unsigned m_bitfields; |
| 102 LayoutRect rect; // Stores the previous paint invalidation rect. | |
| 103 LayoutPoint position; // Stores the previous position from the paint invalid
ation container. | |
| 104 }; | 102 }; |
| 105 | 103 |
| 106 COMPILE_ASSERT(sizeof(RenderObject) == sizeof(SameSizeAsRenderObject), RenderObj
ect_should_stay_small); | 104 COMPILE_ASSERT(sizeof(RenderObject) == sizeof(SameSizeAsRenderObject), RenderObj
ect_should_stay_small); |
| 107 | 105 |
| 108 bool RenderObject::s_affectsParentBlock = false; | 106 bool RenderObject::s_affectsParentBlock = false; |
| 109 | 107 |
| 110 #if !ENABLE(OILPAN) | 108 #if !ENABLE(OILPAN) |
| 111 void* RenderObject::operator new(size_t sz) | 109 void* RenderObject::operator new(size_t sz) |
| 112 { | 110 { |
| 113 ASSERT(isMainThread()); | 111 ASSERT(isMainThread()); |
| (...skipping 2008 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2122 { | 2120 { |
| 2123 if (object1) { | 2121 if (object1) { |
| 2124 const blink::RenderObject* root = object1; | 2122 const blink::RenderObject* root = object1; |
| 2125 while (root->parent()) | 2123 while (root->parent()) |
| 2126 root = root->parent(); | 2124 root = root->parent(); |
| 2127 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 2125 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 2128 } | 2126 } |
| 2129 } | 2127 } |
| 2130 | 2128 |
| 2131 #endif | 2129 #endif |
| OLD | NEW |