| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) | 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) |
| 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
All rights reserved. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
All rights reserved. |
| 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> | 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> |
| 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
| 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. | 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 { | 257 { |
| 258 if (value->isPrimitiveValue()) { | 258 if (value->isPrimitiveValue()) { |
| 259 // FIXME: Shouldn't we clear the grid-area values | 259 // FIXME: Shouldn't we clear the grid-area values |
| 260 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNone); | 260 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNone); |
| 261 return; | 261 return; |
| 262 } | 262 } |
| 263 | 263 |
| 264 CSSGridTemplateAreasValue* gridTemplateAreasValue = toCSSGridTemplateAreasVa
lue(value); | 264 CSSGridTemplateAreasValue* gridTemplateAreasValue = toCSSGridTemplateAreasVa
lue(value); |
| 265 const NamedGridAreaMap& newNamedGridAreas = gridTemplateAreasValue->gridArea
Map(); | 265 const NamedGridAreaMap& newNamedGridAreas = gridTemplateAreasValue->gridArea
Map(); |
| 266 | 266 |
| 267 NamedGridLinesMap namedGridColumnLines = state.style()->namedGridColumnLines
(); | 267 NamedGridLinesMap namedGridColumnLines; |
| 268 NamedGridLinesMap namedGridRowLines = state.style()->namedGridRowLines(); | 268 NamedGridLinesMap namedGridRowLines; |
| 269 StyleBuilderConverter::convertOrderedNamedGridLinesMapToNamedGridLinesMap(st
ate.style()->orderedNamedGridColumnLines(), namedGridColumnLines); |
| 270 StyleBuilderConverter::convertOrderedNamedGridLinesMapToNamedGridLinesMap(st
ate.style()->orderedNamedGridRowLines(), namedGridRowLines); |
| 269 StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(newNamedGrid
Areas, namedGridColumnLines, ForColumns); | 271 StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(newNamedGrid
Areas, namedGridColumnLines, ForColumns); |
| 270 StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(newNamedGrid
Areas, namedGridRowLines, ForRows); | 272 StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(newNamedGrid
Areas, namedGridRowLines, ForRows); |
| 271 state.style()->setNamedGridColumnLines(namedGridColumnLines); | 273 state.style()->setNamedGridColumnLines(namedGridColumnLines); |
| 272 state.style()->setNamedGridRowLines(namedGridRowLines); | 274 state.style()->setNamedGridRowLines(namedGridRowLines); |
| 273 | 275 |
| 274 state.style()->setNamedGridArea(newNamedGridAreas); | 276 state.style()->setNamedGridArea(newNamedGridAreas); |
| 275 state.style()->setNamedGridAreaRowCount(gridTemplateAreasValue->rowCount()); | 277 state.style()->setNamedGridAreaRowCount(gridTemplateAreasValue->rowCount()); |
| 276 state.style()->setNamedGridAreaColumnCount(gridTemplateAreasValue->columnCou
nt()); | 278 state.style()->setNamedGridAreaColumnCount(gridTemplateAreasValue->columnCou
nt()); |
| 277 } | 279 } |
| 278 | 280 |
| (...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 939 return; | 941 return; |
| 940 case CSSValueSuper: | 942 case CSSValueSuper: |
| 941 svgStyle.setBaselineShift(BS_SUPER); | 943 svgStyle.setBaselineShift(BS_SUPER); |
| 942 return; | 944 return; |
| 943 default: | 945 default: |
| 944 ASSERT_NOT_REACHED(); | 946 ASSERT_NOT_REACHED(); |
| 945 } | 947 } |
| 946 } | 948 } |
| 947 | 949 |
| 948 } // namespace blink | 950 } // namespace blink |
| OLD | NEW |