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

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, 4 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
« no previous file with comments | « no previous file | Source/core/rendering/RenderDeprecatedFlexibleBox.h » ('j') | 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 4672 matching lines...) Expand 10 before | Expand all | Expand 10 after
4683 if (isRelPositioned()) 4683 if (isRelPositioned())
4684 return "RenderBlock (relative positioned)"; 4684 return "RenderBlock (relative positioned)";
4685 return "RenderBlock"; 4685 return "RenderBlock";
4686 } 4686 }
4687 4687
4688 RenderBlock* RenderBlock::createAnonymousWithParentRendererAndDisplay(const Rend erObject* parent, EDisplay display) 4688 RenderBlock* RenderBlock::createAnonymousWithParentRendererAndDisplay(const Rend erObject* parent, EDisplay display)
4689 { 4689 {
4690 // FIXME: Do we need to convert all our inline displays to block-type in the anonymous logic ? 4690 // FIXME: Do we need to convert all our inline displays to block-type in the anonymous logic ?
4691 EDisplay newDisplay; 4691 EDisplay newDisplay;
4692 RenderBlock* newBox = 0; 4692 RenderBlock* newBox = 0;
4693 if (display == BOX || display == INLINE_BOX) { 4693 if (display == FLEX || display == INLINE_FLEX) {
4694 // FIXME: Remove this case once we have eliminated all internal users of old flexbox
4695 newBox = RenderDeprecatedFlexibleBox::createAnonymous(&parent->document( ));
4696 newDisplay = BOX;
4697 } else if (display == FLEX || display == INLINE_FLEX) {
4698 newBox = RenderFlexibleBox::createAnonymous(&parent->document()); 4694 newBox = RenderFlexibleBox::createAnonymous(&parent->document());
4699 newDisplay = FLEX; 4695 newDisplay = FLEX;
4700 } else { 4696 } else {
4701 newBox = RenderBlockFlow::createAnonymous(&parent->document()); 4697 newBox = RenderBlockFlow::createAnonymous(&parent->document());
4702 newDisplay = BLOCK; 4698 newDisplay = BLOCK;
4703 } 4699 }
4704 4700
4705 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay( parent->style(), newDisplay); 4701 RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyleWithDisplay( parent->style(), newDisplay);
4706 newBox->setStyle(newStyle.release()); 4702 newBox->setStyle(newStyle.release());
4707 return newBox; 4703 return newBox;
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
4834 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 4830 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
4835 { 4831 {
4836 showRenderObject(); 4832 showRenderObject();
4837 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 4833 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
4838 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 4834 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
4839 } 4835 }
4840 4836
4841 #endif 4837 #endif
4842 4838
4843 } // namespace blink 4839 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderDeprecatedFlexibleBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698