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

Side by Side Diff: Source/core/css/parser/BisonCSSParser-in.cpp

Issue 113943003: [CSS Grid] Introduce an explicit type for resolved grid positions (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@to-land-zero
Patch Set: Created 6 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
« no previous file with comments | « Source/core/css/CSSGridTemplateValue.cpp ('k') | Source/core/rendering/RenderGrid.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) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
9 * Copyright (C) 2012 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "core/css/StyleRuleImport.h" 76 #include "core/css/StyleRuleImport.h"
77 #include "core/css/StyleSheetContents.h" 77 #include "core/css/StyleSheetContents.h"
78 #include "core/css/parser/CSSParserIdioms.h" 78 #include "core/css/parser/CSSParserIdioms.h"
79 #include "core/dom/Document.h" 79 #include "core/dom/Document.h"
80 #include "core/frame/FrameHost.h" 80 #include "core/frame/FrameHost.h"
81 #include "core/frame/PageConsole.h" 81 #include "core/frame/PageConsole.h"
82 #include "core/frame/Settings.h" 82 #include "core/frame/Settings.h"
83 #include "core/html/parser/HTMLParserIdioms.h" 83 #include "core/html/parser/HTMLParserIdioms.h"
84 #include "core/inspector/InspectorInstrumentation.h" 84 #include "core/inspector/InspectorInstrumentation.h"
85 #include "core/rendering/RenderTheme.h" 85 #include "core/rendering/RenderTheme.h"
86 #include "core/rendering/style/GridResolvedPosition.h"
86 #include "core/svg/SVGParserUtilities.h" 87 #include "core/svg/SVGParserUtilities.h"
87 #include "platform/FloatConversion.h" 88 #include "platform/FloatConversion.h"
88 #include "wtf/BitArray.h" 89 #include "wtf/BitArray.h"
89 #include "wtf/HexNumber.h" 90 #include "wtf/HexNumber.h"
90 #include "wtf/text/StringBuffer.h" 91 #include "wtf/text/StringBuffer.h"
91 #include "wtf/text/StringBuilder.h" 92 #include "wtf/text/StringBuilder.h"
92 #include "wtf/text/StringImpl.h" 93 #include "wtf/text/StringImpl.h"
93 #include "wtf/text/TextEncoding.h" 94 #include "wtf/text/TextEncoding.h"
94 #include <limits.h> 95 #include <limits.h>
95 96
(...skipping 4850 matching lines...) Expand 10 before | Expand all | Expand 10 after
4946 } 4947 }
4947 4948
4948 NamedGridAreaMap::iterator gridAreaIt = gridAreaMap.find(gridAreaNam e); 4949 NamedGridAreaMap::iterator gridAreaIt = gridAreaMap.find(gridAreaNam e);
4949 if (gridAreaIt == gridAreaMap.end()) { 4950 if (gridAreaIt == gridAreaMap.end()) {
4950 gridAreaMap.add(gridAreaName, GridCoordinate(GridSpan(rowCount, rowCount), GridSpan(currentCol, lookAheadCol))); 4951 gridAreaMap.add(gridAreaName, GridCoordinate(GridSpan(rowCount, rowCount), GridSpan(currentCol, lookAheadCol)));
4951 } else { 4952 } else {
4952 GridCoordinate& gridCoordinate = gridAreaIt->value; 4953 GridCoordinate& gridCoordinate = gridAreaIt->value;
4953 4954
4954 // The following checks test that the grid area is a single fill ed-in rectangle. 4955 // The following checks test that the grid area is a single fill ed-in rectangle.
4955 // 1. The new row is adjacent to the previously parsed row. 4956 // 1. The new row is adjacent to the previously parsed row.
4956 if (rowCount != gridCoordinate.rows.initialPositionIndex + 1) 4957 if (rowCount != (unsigned)gridCoordinate.rows.initialPositionInd ex + 1)
4957 return 0; 4958 return 0;
4958 4959
4959 // 2. The new area starts at the same position as the previously parsed area. 4960 // 2. The new area starts at the same position as the previously parsed area.
4960 if (currentCol != gridCoordinate.columns.initialPositionIndex) 4961 if (currentCol != (unsigned)gridCoordinate.columns.initialPositi onIndex)
4961 return 0; 4962 return 0;
4962 4963
4963 // 3. The new area ends at the same position as the previously p arsed area. 4964 // 3. The new area ends at the same position as the previously p arsed area.
4964 if (lookAheadCol != gridCoordinate.columns.finalPositionIndex) 4965 if (lookAheadCol != (unsigned)gridCoordinate.columns.finalPositi onIndex)
4965 return 0; 4966 return 0;
4966 4967
4967 ++gridCoordinate.rows.finalPositionIndex; 4968 gridCoordinate.rows.finalPositionIndex.setIntegerPosition(gridCo ordinate.rows.finalPositionIndex.integerPosition() + 1);
4968 } 4969 }
4969 currentCol = lookAheadCol; 4970 currentCol = lookAheadCol;
4970 } 4971 }
4971 4972
4972 ++rowCount; 4973 ++rowCount;
4973 m_valueList->next(); 4974 m_valueList->next();
4974 } 4975 }
4975 4976
4976 if (!rowCount || !columnCount) 4977 if (!rowCount || !columnCount)
4977 return 0; 4978 return 0;
(...skipping 5494 matching lines...) Expand 10 before | Expand all | Expand 10 after
10472 { 10473 {
10473 // The tokenizer checks for the construct of an+b. 10474 // The tokenizer checks for the construct of an+b.
10474 // However, since the {ident} rule precedes the {nth} rule, some of those 10475 // However, since the {ident} rule precedes the {nth} rule, some of those
10475 // tokens are identified as string literal. Furthermore we need to accept 10476 // tokens are identified as string literal. Furthermore we need to accept
10476 // "odd" and "even" which does not match to an+b. 10477 // "odd" and "even" which does not match to an+b.
10477 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") 10478 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
10478 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 10479 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
10479 } 10480 }
10480 10481
10481 } 10482 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSGridTemplateValue.cpp ('k') | Source/core/rendering/RenderGrid.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698