| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 #include "core/rendering/RenderDeprecatedFlexibleBox.h" | 55 #include "core/rendering/RenderDeprecatedFlexibleBox.h" |
| 56 #include "core/rendering/RenderFlexibleBox.h" | 56 #include "core/rendering/RenderFlexibleBox.h" |
| 57 #include "core/rendering/RenderGeometryMap.h" | 57 #include "core/rendering/RenderGeometryMap.h" |
| 58 #include "core/rendering/RenderGrid.h" | 58 #include "core/rendering/RenderGrid.h" |
| 59 #include "core/rendering/RenderImage.h" | 59 #include "core/rendering/RenderImage.h" |
| 60 #include "core/rendering/RenderImageResourceStyleImage.h" | 60 #include "core/rendering/RenderImageResourceStyleImage.h" |
| 61 #include "core/rendering/RenderInline.h" | 61 #include "core/rendering/RenderInline.h" |
| 62 #include "core/rendering/RenderLayer.h" | 62 #include "core/rendering/RenderLayer.h" |
| 63 #include "core/rendering/RenderLayerBacking.h" | 63 #include "core/rendering/RenderLayerBacking.h" |
| 64 #include "core/rendering/RenderLayerCompositor.h" | 64 #include "core/rendering/RenderLayerCompositor.h" |
| 65 #include "core/rendering/RenderLazyBlock.h" |
| 65 #include "core/rendering/RenderListItem.h" | 66 #include "core/rendering/RenderListItem.h" |
| 66 #include "core/rendering/RenderMultiColumnBlock.h" | 67 #include "core/rendering/RenderMultiColumnBlock.h" |
| 67 #include "core/rendering/RenderNamedFlowThread.h" | 68 #include "core/rendering/RenderNamedFlowThread.h" |
| 68 #include "core/rendering/RenderRegion.h" | 69 #include "core/rendering/RenderRegion.h" |
| 69 #include "core/rendering/RenderRuby.h" | 70 #include "core/rendering/RenderRuby.h" |
| 70 #include "core/rendering/RenderRubyText.h" | 71 #include "core/rendering/RenderRubyText.h" |
| 71 #include "core/rendering/RenderScrollbarPart.h" | 72 #include "core/rendering/RenderScrollbarPart.h" |
| 72 #include "core/rendering/RenderTableCaption.h" | 73 #include "core/rendering/RenderTableCaption.h" |
| 73 #include "core/rendering/RenderTableCell.h" | 74 #include "core/rendering/RenderTableCell.h" |
| 74 #include "core/rendering/RenderTableCol.h" | 75 #include "core/rendering/RenderTableCol.h" |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 return new (arena) RenderTableCaption(element); | 203 return new (arena) RenderTableCaption(element); |
| 203 case BOX: | 204 case BOX: |
| 204 case INLINE_BOX: | 205 case INLINE_BOX: |
| 205 return new (arena) RenderDeprecatedFlexibleBox(element); | 206 return new (arena) RenderDeprecatedFlexibleBox(element); |
| 206 case FLEX: | 207 case FLEX: |
| 207 case INLINE_FLEX: | 208 case INLINE_FLEX: |
| 208 return new (arena) RenderFlexibleBox(element); | 209 return new (arena) RenderFlexibleBox(element); |
| 209 case GRID: | 210 case GRID: |
| 210 case INLINE_GRID: | 211 case INLINE_GRID: |
| 211 return new (arena) RenderGrid(element); | 212 return new (arena) RenderGrid(element); |
| 213 case LAZY_BLOCK: |
| 214 return new (arena) RenderLazyBlock(element); |
| 212 } | 215 } |
| 213 | 216 |
| 214 return 0; | 217 return 0; |
| 215 } | 218 } |
| 216 | 219 |
| 217 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, renderObjectCounter, ("Rend
erObject")); | 220 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, renderObjectCounter, ("Rend
erObject")); |
| 218 | 221 |
| 219 RenderObject::RenderObject(Node* node) | 222 RenderObject::RenderObject(Node* node) |
| 220 : CachedImageClient() | 223 : CachedImageClient() |
| 221 , m_style(0) | 224 , m_style(0) |
| (...skipping 2944 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3166 { | 3169 { |
| 3167 if (object1) { | 3170 if (object1) { |
| 3168 const WebCore::RenderObject* root = object1; | 3171 const WebCore::RenderObject* root = object1; |
| 3169 while (root->parent()) | 3172 while (root->parent()) |
| 3170 root = root->parent(); | 3173 root = root->parent(); |
| 3171 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3174 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 3172 } | 3175 } |
| 3173 } | 3176 } |
| 3174 | 3177 |
| 3175 #endif | 3178 #endif |
| OLD | NEW |