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

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

Issue 23072015: Get rid of lazy block. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/CSSPrimitiveValueMappings.h ('k') | Source/core/page/FrameView.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) 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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 } 88 }
89 89
90 static EDisplay equivalentBlockDisplay(EDisplay display, bool isFloating, bool s trictParsing) 90 static EDisplay equivalentBlockDisplay(EDisplay display, bool isFloating, bool s trictParsing)
91 { 91 {
92 switch (display) { 92 switch (display) {
93 case BLOCK: 93 case BLOCK:
94 case TABLE: 94 case TABLE:
95 case BOX: 95 case BOX:
96 case FLEX: 96 case FLEX:
97 case GRID: 97 case GRID:
98 case LAZY_BLOCK:
99 return display; 98 return display;
100 99
101 case LIST_ITEM: 100 case LIST_ITEM:
102 // It is a WinIE bug that floated list items lose their bullets, so we'l l emulate the quirk, but only in quirks mode. 101 // It is a WinIE bug that floated list items lose their bullets, so we'l l emulate the quirk, but only in quirks mode.
103 if (!strictParsing && isFloating) 102 if (!strictParsing && isFloating)
104 return BLOCK; 103 return BLOCK;
105 return display; 104 return display;
106 case INLINE_TABLE: 105 case INLINE_TABLE:
107 return TABLE; 106 return TABLE;
108 case INLINE_BOX: 107 case INLINE_BOX:
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 if (prop.isNamedGridArea() && !map.contains(prop.namedGridLine())) \ 412 if (prop.isNamedGridArea() && !map.contains(prop.namedGridLine())) \
414 style->setGrid##Prop(GridPosition()); 413 style->setGrid##Prop(GridPosition());
415 414
416 CLEAR_UNKNOWN_NAMED_AREA(columnStartPosition, ColumnStart); 415 CLEAR_UNKNOWN_NAMED_AREA(columnStartPosition, ColumnStart);
417 CLEAR_UNKNOWN_NAMED_AREA(columnEndPosition, ColumnEnd); 416 CLEAR_UNKNOWN_NAMED_AREA(columnEndPosition, ColumnEnd);
418 CLEAR_UNKNOWN_NAMED_AREA(rowStartPosition, RowStart); 417 CLEAR_UNKNOWN_NAMED_AREA(rowStartPosition, RowStart);
419 CLEAR_UNKNOWN_NAMED_AREA(rowEndPosition, RowEnd); 418 CLEAR_UNKNOWN_NAMED_AREA(rowEndPosition, RowEnd);
420 } 419 }
421 420
422 } 421 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSPrimitiveValueMappings.h ('k') | Source/core/page/FrameView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698