OLD | NEW |
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 1892 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1903 } | 1903 } |
1904 | 1904 |
1905 NamedGridAreaMap::iterator gridAreaIt = gridAreaMap.find(gridAreaName); | 1905 NamedGridAreaMap::iterator gridAreaIt = gridAreaMap.find(gridAreaName); |
1906 if (gridAreaIt == gridAreaMap.end()) { | 1906 if (gridAreaIt == gridAreaMap.end()) { |
1907 gridAreaMap.add(gridAreaName, GridArea(GridSpan::translatedDefiniteG
ridSpan(rowCount, rowCount + 1), GridSpan::translatedDefiniteGridSpan(currentCol
, lookAheadCol))); | 1907 gridAreaMap.add(gridAreaName, GridArea(GridSpan::translatedDefiniteG
ridSpan(rowCount, rowCount + 1), GridSpan::translatedDefiniteGridSpan(currentCol
, lookAheadCol))); |
1908 } else { | 1908 } else { |
1909 GridArea& gridArea = gridAreaIt->value; | 1909 GridArea& gridArea = gridAreaIt->value; |
1910 | 1910 |
1911 // The following checks test that the grid area is a single filled-i
n rectangle. | 1911 // The following checks test that the grid area is a single filled-i
n rectangle. |
1912 // 1. The new row is adjacent to the previously parsed row. | 1912 // 1. The new row is adjacent to the previously parsed row. |
1913 if (rowCount != gridArea.rows.resolvedFinalPosition()) | 1913 if (rowCount != gridArea.rows.endLine()) |
1914 return false; | 1914 return false; |
1915 | 1915 |
1916 // 2. The new area starts at the same position as the previously par
sed area. | 1916 // 2. The new area starts at the same position as the previously par
sed area. |
1917 if (currentCol != gridArea.columns.resolvedInitialPosition()) | 1917 if (currentCol != gridArea.columns.startLine()) |
1918 return false; | 1918 return false; |
1919 | 1919 |
1920 // 3. The new area ends at the same position as the previously parse
d area. | 1920 // 3. The new area ends at the same position as the previously parse
d area. |
1921 if (lookAheadCol != gridArea.columns.resolvedFinalPosition()) | 1921 if (lookAheadCol != gridArea.columns.endLine()) |
1922 return false; | 1922 return false; |
1923 | 1923 |
1924 gridArea.rows = GridSpan::translatedDefiniteGridSpan(gridArea.rows.r
esolvedInitialPosition(), gridArea.rows.resolvedFinalPosition() + 1); | 1924 gridArea.rows = GridSpan::translatedDefiniteGridSpan(gridArea.rows.s
tartLine(), gridArea.rows.endLine() + 1); |
1925 } | 1925 } |
1926 currentCol = lookAheadCol - 1; | 1926 currentCol = lookAheadCol - 1; |
1927 } | 1927 } |
1928 | 1928 |
1929 m_valueList->next(); | 1929 m_valueList->next(); |
1930 return true; | 1930 return true; |
1931 } | 1931 } |
1932 | 1932 |
1933 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseGridTemplateAreas() | 1933 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseGridTemplateAreas() |
1934 { | 1934 { |
(...skipping 1152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3087 ASSERT(!m_parsedCalculation); | 3087 ASSERT(!m_parsedCalculation); |
3088 m_parsedCalculation = CSSCalcValue::create(args, range); | 3088 m_parsedCalculation = CSSCalcValue::create(args, range); |
3089 | 3089 |
3090 if (!m_parsedCalculation) | 3090 if (!m_parsedCalculation) |
3091 return false; | 3091 return false; |
3092 | 3092 |
3093 return true; | 3093 return true; |
3094 } | 3094 } |
3095 | 3095 |
3096 } // namespace blink | 3096 } // namespace blink |
OLD | NEW |