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

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

Issue 363343005: Remove support for anonymous deprecated flexboxes. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 5 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 4881 matching lines...) Expand 10 before | Expand all | Expand 10 after
4892 if (isRelPositioned()) 4892 if (isRelPositioned())
4893 return "RenderBlock (relative positioned)"; 4893 return "RenderBlock (relative positioned)";
4894 return "RenderBlock"; 4894 return "RenderBlock";
4895 } 4895 }
4896 4896
4897 RenderBlock* RenderBlock::createAnonymousWithParentRendererAndDisplay(const Rend erObject* parent, EDisplay display) 4897 RenderBlock* RenderBlock::createAnonymousWithParentRendererAndDisplay(const Rend erObject* parent, EDisplay display)
4898 { 4898 {
4899 // FIXME: Do we need to convert all our inline displays to block-type in the anonymous logic ? 4899 // FIXME: Do we need to convert all our inline displays to block-type in the anonymous logic ?
4900 EDisplay newDisplay; 4900 EDisplay newDisplay;
4901 RenderBlock* newBox = 0; 4901 RenderBlock* newBox = 0;
4902 if (display == BOX || display == INLINE_BOX) { 4902 if (display == FLEX || display == INLINE_FLEX) {
4903 // FIXME: Remove this case once we have eliminated all internal users of old flexbox
4904 newBox = RenderDeprecatedFlexibleBox::createAnonymous(&parent->document( ));
4905 newDisplay = BOX;
4906 } else if (display == FLEX || display == INLINE_FLEX) {
4907 newBox = RenderFlexibleBox::createAnonymous(&parent->document()); 4903 newBox = RenderFlexibleBox::createAnonymous(&parent->document());
4908 newDisplay = FLEX; 4904 newDisplay = FLEX;
4909 } else { 4905 } else {
4910 newBox = RenderBlockFlow::createAnonymous(&parent->document()); 4906 newBox = RenderBlockFlow::createAnonymous(&parent->document());
4911 newDisplay = BLOCK; 4907 newDisplay = BLOCK;
4912 } 4908 }
4913 4909
4914 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay( parent->style(), newDisplay); 4910 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay( parent->style(), newDisplay);
4915 newBox->setStyle(newStyle.release()); 4911 newBox->setStyle(newStyle.release());
4916 return newBox; 4912 return newBox;
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
5039 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 5035 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
5040 { 5036 {
5041 showRenderObject(); 5037 showRenderObject();
5042 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 5038 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
5043 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 5039 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
5044 } 5040 }
5045 5041
5046 #endif 5042 #endif
5047 5043
5048 } // namespace WebCore 5044 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698