| 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) 2007 David Smith (catfish.man@gmail.com) | 4 * (C) 2007 David Smith (catfish.man@gmail.com) |
| 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. |
| 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 416 if (beforeChild && beforeChild->parent() != this) { | 416 if (beforeChild && beforeChild->parent() != this) { |
| 417 LayoutObject* beforeChildContainer = beforeChild->parent(); | 417 LayoutObject* beforeChildContainer = beforeChild->parent(); |
| 418 while (beforeChildContainer->parent() != this) | 418 while (beforeChildContainer->parent() != this) |
| 419 beforeChildContainer = beforeChildContainer->parent(); | 419 beforeChildContainer = beforeChildContainer->parent(); |
| 420 ASSERT(beforeChildContainer); | 420 ASSERT(beforeChildContainer); |
| 421 | 421 |
| 422 if (beforeChildContainer->isAnonymous()) { | 422 if (beforeChildContainer->isAnonymous()) { |
| 423 // If the requested beforeChild is not one of our children, then thi
s is because | 423 // If the requested beforeChild is not one of our children, then thi
s is because |
| 424 // there is an anonymous container within this object that contains
the beforeChild. | 424 // there is an anonymous container within this object that contains
the beforeChild. |
| 425 LayoutObject* beforeChildAnonymousContainer = beforeChildContainer; | 425 LayoutObject* beforeChildAnonymousContainer = beforeChildContainer; |
| 426 if (beforeChildAnonymousContainer->isAnonymousBlock() | 426 if (beforeChildAnonymousContainer->isAnonymousBlock()) { |
| 427 // Full screen layoutObjects and full screen placeholders act as
anonymous blocks, not tables: | |
| 428 || beforeChildAnonymousContainer->isLayoutFullScreen() | |
| 429 || beforeChildAnonymousContainer->isLayoutFullScreenPlaceholder(
) | |
| 430 ) { | |
| 431 // Insert the child into the anonymous block box instead of here
. | 427 // Insert the child into the anonymous block box instead of here
. |
| 432 if (newChild->isInline() || newChild->isFloatingOrOutOfFlowPosit
ioned() || beforeChild->parent()->slowFirstChild() != beforeChild) | 428 if (newChild->isInline() || newChild->isFloatingOrOutOfFlowPosit
ioned() || beforeChild->parent()->slowFirstChild() != beforeChild) |
| 433 beforeChild->parent()->addChild(newChild, beforeChild); | 429 beforeChild->parent()->addChild(newChild, beforeChild); |
| 434 else | 430 else |
| 435 addChild(newChild, beforeChild->parent()); | 431 addChild(newChild, beforeChild->parent()); |
| 436 return; | 432 return; |
| 437 } | 433 } |
| 438 | 434 |
| 439 ASSERT(beforeChildAnonymousContainer->isTable()); | 435 ASSERT(beforeChildAnonymousContainer->isTable()); |
| 440 if (newChild->isTablePart()) { | 436 if (newChild->isTablePart()) { |
| (...skipping 2501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2942 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout
Object* obj) const | 2938 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout
Object* obj) const |
| 2943 { | 2939 { |
| 2944 showLayoutObject(); | 2940 showLayoutObject(); |
| 2945 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 2941 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
| 2946 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 2942 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
| 2947 } | 2943 } |
| 2948 | 2944 |
| 2949 #endif | 2945 #endif |
| 2950 | 2946 |
| 2951 } // namespace blink | 2947 } // namespace blink |
| OLD | NEW |