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 3692 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3703 } | 3703 } |
3704 | 3704 |
3705 NamedGridAreaMap::iterator gridAreaIt = gridAreaMap.find(gridAreaNam
e); | 3705 NamedGridAreaMap::iterator gridAreaIt = gridAreaMap.find(gridAreaNam
e); |
3706 if (gridAreaIt == gridAreaMap.end()) { | 3706 if (gridAreaIt == gridAreaMap.end()) { |
3707 gridAreaMap.add(gridAreaName, GridCoordinate(GridSpan(rowCount,
rowCount), GridSpan(currentCol, lookAheadCol))); | 3707 gridAreaMap.add(gridAreaName, GridCoordinate(GridSpan(rowCount,
rowCount), GridSpan(currentCol, lookAheadCol))); |
3708 } else { | 3708 } else { |
3709 GridCoordinate& gridCoordinate = gridAreaIt->value; | 3709 GridCoordinate& gridCoordinate = gridAreaIt->value; |
3710 | 3710 |
3711 // The following checks test that the grid area is a single fill
ed-in rectangle. | 3711 // The following checks test that the grid area is a single fill
ed-in rectangle. |
3712 // 1. The new row is adjacent to the previously parsed row. | 3712 // 1. The new row is adjacent to the previously parsed row. |
3713 if (rowCount != gridCoordinate.rows.initialPositionIndex + 1) | 3713 if (rowCount != gridCoordinate.rows.resolvedInitialPosition.next
()) |
3714 return nullptr; | 3714 return nullptr; |
3715 | 3715 |
3716 // 2. The new area starts at the same position as the previously
parsed area. | 3716 // 2. The new area starts at the same position as the previously
parsed area. |
3717 if (currentCol != gridCoordinate.columns.initialPositionIndex) | 3717 if (currentCol != gridCoordinate.columns.resolvedInitialPosition
) |
3718 return nullptr; | 3718 return nullptr; |
3719 | 3719 |
3720 // 3. The new area ends at the same position as the previously p
arsed area. | 3720 // 3. The new area ends at the same position as the previously p
arsed area. |
3721 if (lookAheadCol != gridCoordinate.columns.finalPositionIndex) | 3721 if (lookAheadCol != gridCoordinate.columns.resolvedFinalPosition
) |
3722 return nullptr; | 3722 return nullptr; |
3723 | 3723 |
3724 ++gridCoordinate.rows.finalPositionIndex; | 3724 ++gridCoordinate.rows.resolvedFinalPosition; |
3725 } | 3725 } |
3726 currentCol = lookAheadCol; | 3726 currentCol = lookAheadCol; |
3727 } | 3727 } |
3728 | 3728 |
3729 ++rowCount; | 3729 ++rowCount; |
3730 m_valueList->next(); | 3730 m_valueList->next(); |
3731 } | 3731 } |
3732 | 3732 |
3733 if (!rowCount || !columnCount) | 3733 if (!rowCount || !columnCount) |
3734 return nullptr; | 3734 return nullptr; |
(...skipping 4721 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
8456 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); | 8456 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); |
8457 if (!seenStroke) | 8457 if (!seenStroke) |
8458 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); | 8458 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); |
8459 if (!seenMarkers) | 8459 if (!seenMarkers) |
8460 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); | 8460 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); |
8461 | 8461 |
8462 return parsedValues.release(); | 8462 return parsedValues.release(); |
8463 } | 8463 } |
8464 | 8464 |
8465 } // namespace WebCore | 8465 } // namespace WebCore |
OLD | NEW |