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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBlock.cpp

Issue 1611413007: Remove unnecessary anonymous blocks when splitting anonymous boxes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@568387-RemovePercentHeight
Patch Set: Updated Created 4 years, 10 months 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
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 637 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 setChildrenInline(true); 648 setChildrenInline(true);
649 } 649 }
650 650
651 void LayoutBlock::collapseAnonymousBlockChild(LayoutBlock* parent, LayoutBlock* child) 651 void LayoutBlock::collapseAnonymousBlockChild(LayoutBlock* parent, LayoutBlock* child)
652 { 652 {
653 // It's possible that this block's destruction may have been triggered by th e 653 // It's possible that this block's destruction may have been triggered by th e
654 // child's removal. Just bail if the anonymous child block is already being 654 // child's removal. Just bail if the anonymous child block is already being
655 // destroyed. See crbug.com/282088 655 // destroyed. See crbug.com/282088
656 if (child->beingDestroyed()) 656 if (child->beingDestroyed())
657 return; 657 return;
658 if (child->continuation())
659 return;
660 // Ruby elements use anonymous wrappers for ruby runs and ruby bases by desi gn, so we don't remove them.
661 if (child->isRubyRun() || child->isRubyBase())
662 return;
658 parent->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(LayoutInva lidationReason::ChildAnonymousBlockChanged); 663 parent->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(LayoutInva lidationReason::ChildAnonymousBlockChanged);
659 664
660 child->moveAllChildrenTo(parent, child->nextSibling(), child->hasLayer()); 665 child->moveAllChildrenTo(parent, child->nextSibling(), child->hasLayer());
661 parent->setChildrenInline(child->childrenInline()); 666 parent->setChildrenInline(child->childrenInline());
662 667
663 parent->children()->removeChildNode(parent, child, child->hasLayer()); 668 parent->children()->removeChildNode(parent, child, child->hasLayer());
664 child->destroy(); 669 child->destroy();
665 } 670 }
666 671
667 void LayoutBlock::removeChild(LayoutObject* oldChild) 672 void LayoutBlock::removeChild(LayoutObject* oldChild)
(...skipping 2190 matching lines...) Expand 10 before | Expand all | Expand 10 after
2858 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const 2863 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const
2859 { 2864 {
2860 showLayoutObject(); 2865 showLayoutObject();
2861 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2866 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2862 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2867 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2863 } 2868 }
2864 2869
2865 #endif 2870 #endif
2866 2871
2867 } // namespace blink 2872 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.h ('k') | third_party/WebKit/Source/core/layout/LayoutBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698