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

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp

Issue 2620623002: Implement display:flow-root (Closed)
Patch Set: bug 672508 Created 3 years, 11 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) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
10 * (http://www.torchmobile.com/) 10 * (http://www.torchmobile.com/)
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 using namespace HTMLNames; 56 using namespace HTMLNames;
57 57
58 static EDisplay equivalentBlockDisplay(EDisplay display) { 58 static EDisplay equivalentBlockDisplay(EDisplay display) {
59 switch (display) { 59 switch (display) {
60 case EDisplay::Block: 60 case EDisplay::Block:
61 case EDisplay::Table: 61 case EDisplay::Table:
62 case EDisplay::WebkitBox: 62 case EDisplay::WebkitBox:
63 case EDisplay::Flex: 63 case EDisplay::Flex:
64 case EDisplay::Grid: 64 case EDisplay::Grid:
65 case EDisplay::ListItem: 65 case EDisplay::ListItem:
66 case EDisplay::FlowRoot:
66 return display; 67 return display;
67 case EDisplay::InlineTable: 68 case EDisplay::InlineTable:
68 return EDisplay::Table; 69 return EDisplay::Table;
69 case EDisplay::WebkitInlineBox: 70 case EDisplay::WebkitInlineBox:
70 return EDisplay::WebkitBox; 71 return EDisplay::WebkitBox;
71 case EDisplay::InlineFlex: 72 case EDisplay::InlineFlex:
72 return EDisplay::Flex; 73 return EDisplay::Flex;
73 case EDisplay::InlineGrid: 74 case EDisplay::InlineGrid:
74 return EDisplay::Grid; 75 return EDisplay::Grid;
75 76
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 style.setDisplay(EDisplay::Block); 476 style.setDisplay(EDisplay::Block);
476 477
477 // Columns don't apply to svg text elements. 478 // Columns don't apply to svg text elements.
478 if (isSVGTextElement(*element)) 479 if (isSVGTextElement(*element))
479 style.clearMultiCol(); 480 style.clearMultiCol();
480 } 481 }
481 adjustStyleForAlignment(style, parentStyle); 482 adjustStyleForAlignment(style, parentStyle);
482 } 483 }
483 484
484 } // namespace blink 485 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSValueKeywords.json5 ('k') | third_party/WebKit/Source/core/layout/LayoutBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698