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

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

Issue 52713012: Remove display:compact as per https://groups.google.com/a/chromium.org/d/topic/blink-dev/j6QErzkX4R… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: try again Created 7 years, 1 month 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 | « Source/core/css/CSSValueKeywords.in ('k') | Source/core/rendering/RenderObject.cpp » ('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) 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. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 case INLINE_TABLE: 104 case INLINE_TABLE:
105 return TABLE; 105 return TABLE;
106 case INLINE_BOX: 106 case INLINE_BOX:
107 return BOX; 107 return BOX;
108 case INLINE_FLEX: 108 case INLINE_FLEX:
109 return FLEX; 109 return FLEX;
110 case INLINE_GRID: 110 case INLINE_GRID:
111 return GRID; 111 return GRID;
112 112
113 case INLINE: 113 case INLINE:
114 case COMPACT:
115 case INLINE_BLOCK: 114 case INLINE_BLOCK:
116 case TABLE_ROW_GROUP: 115 case TABLE_ROW_GROUP:
117 case TABLE_HEADER_GROUP: 116 case TABLE_HEADER_GROUP:
118 case TABLE_FOOTER_GROUP: 117 case TABLE_FOOTER_GROUP:
119 case TABLE_ROW: 118 case TABLE_ROW:
120 case TABLE_COLUMN_GROUP: 119 case TABLE_COLUMN_GROUP:
121 case TABLE_COLUMN: 120 case TABLE_COLUMN:
122 case TABLE_CELL: 121 case TABLE_CELL:
123 case TABLE_CAPTION: 122 case TABLE_CAPTION:
124 return BLOCK; 123 return BLOCK;
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 if (prop.isNamedGridArea() && !map.contains(prop.namedGridLine())) \ 411 if (prop.isNamedGridArea() && !map.contains(prop.namedGridLine())) \
413 style->setGrid##Prop(GridPosition()); 412 style->setGrid##Prop(GridPosition());
414 413
415 CLEAR_UNKNOWN_NAMED_AREA(columnStartPosition, ColumnStart); 414 CLEAR_UNKNOWN_NAMED_AREA(columnStartPosition, ColumnStart);
416 CLEAR_UNKNOWN_NAMED_AREA(columnEndPosition, ColumnEnd); 415 CLEAR_UNKNOWN_NAMED_AREA(columnEndPosition, ColumnEnd);
417 CLEAR_UNKNOWN_NAMED_AREA(rowStartPosition, RowStart); 416 CLEAR_UNKNOWN_NAMED_AREA(rowStartPosition, RowStart);
418 CLEAR_UNKNOWN_NAMED_AREA(rowEndPosition, RowEnd); 417 CLEAR_UNKNOWN_NAMED_AREA(rowEndPosition, RowEnd);
419 } 418 }
420 419
421 } 420 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSValueKeywords.in ('k') | Source/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698