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 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
278 | 278 |
279 void RenderObject::addChild(RenderObject* newChild, RenderObject* beforeChild) | 279 void RenderObject::addChild(RenderObject* newChild, RenderObject* beforeChild) |
280 { | 280 { |
281 RenderObjectChildList* children = virtualChildren(); | 281 RenderObjectChildList* children = virtualChildren(); |
282 ASSERT(children); | 282 ASSERT(children); |
283 if (!children) | 283 if (!children) |
284 return; | 284 return; |
285 | 285 |
286 RenderObject* beforeContent = 0; | 286 RenderObject* beforeContent = 0; |
287 bool beforeChildHasBeforeAndAfterContent = false; | 287 bool beforeChildHasBeforeAndAfterContent = false; |
288 if (beforeChild && (beforeChild->isTable() || beforeChild->isTableSection()
|| beforeChild->isTableRow())) { | 288 if (beforeChild && (beforeChild->isTable() || beforeChild->isTableSection()
|| beforeChild->isTableRow() || beforeChild->isTableCell())) { |
289 beforeContent = beforeChild->findBeforeContentRenderer(); | 289 beforeContent = beforeChild->findBeforeContentRenderer(); |
290 RenderObject* afterContent = beforeChild->findAfterContentRenderer(); | 290 RenderObject* afterContent = beforeChild->findAfterContentRenderer(); |
291 if (beforeContent && afterContent) { | 291 if (beforeContent && afterContent) { |
292 beforeChildHasBeforeAndAfterContent = true; | 292 beforeChildHasBeforeAndAfterContent = true; |
293 beforeContent->destroy(); | 293 beforeContent->destroy(); |
294 } | 294 } |
295 } | 295 } |
296 | 296 |
297 bool needsTable = false; | 297 bool needsTable = false; |
298 | 298 |
(...skipping 2417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2716 { | 2716 { |
2717 if (object1) { | 2717 if (object1) { |
2718 const WebCore::RenderObject* root = object1; | 2718 const WebCore::RenderObject* root = object1; |
2719 while (root->parent()) | 2719 while (root->parent()) |
2720 root = root->parent(); | 2720 root = root->parent(); |
2721 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 2721 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
2722 } | 2722 } |
2723 } | 2723 } |
2724 | 2724 |
2725 #endif | 2725 #endif |
OLD | NEW |