| 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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 return !isTable(); | 318 return !isTable(); |
| 319 else if (newChild->isTableSection()) | 319 else if (newChild->isTableSection()) |
| 320 return !isTable(); | 320 return !isTable(); |
| 321 else if (newChild->isTableRow()) | 321 else if (newChild->isTableRow()) |
| 322 return !isTableSection(); | 322 return !isTableSection(); |
| 323 else if (newChild->isTableCell()) | 323 else if (newChild->isTableCell()) |
| 324 return !isTableRow(); | 324 return !isTableRow(); |
| 325 return false; | 325 return false; |
| 326 } | 326 } |
| 327 | 327 |
| 328 bool RenderObject::isValidColumnSpanAll() const |
| 329 { |
| 330 ASSERT(style()->columnSpan() == ColumnSpanAll); |
| 331 RenderFlowThread* flowThread = flowThreadContainingBlock(); |
| 332 return flowThread && flowThread->isColumnSpanner(this); |
| 333 } |
| 334 |
| 328 void RenderObject::addChild(RenderObject* newChild, RenderObject* beforeChild) | 335 void RenderObject::addChild(RenderObject* newChild, RenderObject* beforeChild) |
| 329 { | 336 { |
| 330 ASSERT(isAllowedToModifyRenderTreeStructure(document())); | 337 ASSERT(isAllowedToModifyRenderTreeStructure(document())); |
| 331 | 338 |
| 332 RenderObjectChildList* children = virtualChildren(); | 339 RenderObjectChildList* children = virtualChildren(); |
| 333 ASSERT(children); | 340 ASSERT(children); |
| 334 if (!children) | 341 if (!children) |
| 335 return; | 342 return; |
| 336 | 343 |
| 337 if (requiresAnonymousTableWrappers(newChild)) { | 344 if (requiresAnonymousTableWrappers(newChild)) { |
| (...skipping 2849 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3187 { | 3194 { |
| 3188 if (object1) { | 3195 if (object1) { |
| 3189 const blink::RenderObject* root = object1; | 3196 const blink::RenderObject* root = object1; |
| 3190 while (root->parent()) | 3197 while (root->parent()) |
| 3191 root = root->parent(); | 3198 root = root->parent(); |
| 3192 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3199 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 3193 } | 3200 } |
| 3194 } | 3201 } |
| 3195 | 3202 |
| 3196 #endif | 3203 #endif |
| OLD | NEW |