Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(263)

Side by Side Diff: Source/core/rendering/RenderBlock.cpp

Issue 120603002: Fix render tree creation in blocks with multiple anonymous blocks and mixed inlines/out of flow chi… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed markup Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « LayoutTests/fast/inline/reattach-inlines-in-anonymous-blocks-with-out-of-flow-siblings-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 709 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 if (beforeChildContainer->isAnonymous()) { 720 if (beforeChildContainer->isAnonymous()) {
721 // If the requested beforeChild is not one of our children, then thi s is because 721 // If the requested beforeChild is not one of our children, then thi s is because
722 // there is an anonymous container within this object that contains the beforeChild. 722 // there is an anonymous container within this object that contains the beforeChild.
723 RenderObject* beforeChildAnonymousContainer = beforeChildContainer; 723 RenderObject* beforeChildAnonymousContainer = beforeChildContainer;
724 if (beforeChildAnonymousContainer->isAnonymousBlock() 724 if (beforeChildAnonymousContainer->isAnonymousBlock()
725 // Full screen renderers and full screen placeholders act as ano nymous blocks, not tables: 725 // Full screen renderers and full screen placeholders act as ano nymous blocks, not tables:
726 || beforeChildAnonymousContainer->isRenderFullScreen() 726 || beforeChildAnonymousContainer->isRenderFullScreen()
727 || beforeChildAnonymousContainer->isRenderFullScreenPlaceholder( ) 727 || beforeChildAnonymousContainer->isRenderFullScreenPlaceholder( )
728 ) { 728 ) {
729 // Insert the child into the anonymous block box instead of here . 729 // Insert the child into the anonymous block box instead of here .
730 if (newChild->isInline() || beforeChild->parent()->firstChild() != beforeChild) 730 if (newChild->isInline() || newChild->isFloatingOrOutOfFlowPosit ioned() || beforeChild->parent()->firstChild() != beforeChild)
731 beforeChild->parent()->addChild(newChild, beforeChild); 731 beforeChild->parent()->addChild(newChild, beforeChild);
732 else 732 else
733 addChild(newChild, beforeChild->parent()); 733 addChild(newChild, beforeChild->parent());
734 return; 734 return;
735 } 735 }
736 736
737 ASSERT(beforeChildAnonymousContainer->isTable()); 737 ASSERT(beforeChildAnonymousContainer->isTable());
738 if (newChild->isTablePart()) { 738 if (newChild->isTablePart()) {
739 // Insert into the anonymous table. 739 // Insert into the anonymous table.
740 beforeChildAnonymousContainer->addChild(newChild, beforeChild); 740 beforeChildAnonymousContainer->addChild(newChild, beforeChild);
(...skipping 5058 matching lines...) Expand 10 before | Expand all | Expand 10 after
5799 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 5799 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
5800 { 5800 {
5801 showRenderObject(); 5801 showRenderObject();
5802 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 5802 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
5803 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 5803 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
5804 } 5804 }
5805 5805
5806 #endif 5806 #endif
5807 5807
5808 } // namespace WebCore 5808 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/inline/reattach-inlines-in-anonymous-blocks-with-out-of-flow-siblings-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698