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

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

Issue 148293008: [CSS Grid Layout] Add support to place items using named grid lines (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing v3. Fix for Debug bot Created 6 years, 7 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
OLDNEW
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 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 316
317 void StyleBuilderFunctions::applyValueCSSPropertyGridTemplateAreas(StyleResolver State& state, CSSValue* value) 317 void StyleBuilderFunctions::applyValueCSSPropertyGridTemplateAreas(StyleResolver State& state, CSSValue* value)
318 { 318 {
319 if (value->isPrimitiveValue()) { 319 if (value->isPrimitiveValue()) {
320 // FIXME: Shouldn't we clear the grid-area values 320 // FIXME: Shouldn't we clear the grid-area values
321 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNone); 321 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNone);
322 return; 322 return;
323 } 323 }
324 324
325 CSSGridTemplateAreasValue* gridTemplateAreasValue = toCSSGridTemplateAreasVa lue(value); 325 CSSGridTemplateAreasValue* gridTemplateAreasValue = toCSSGridTemplateAreasVa lue(value);
326 state.style()->setNamedGridArea(gridTemplateAreasValue->gridAreaMap()); 326 const NamedGridAreaMap& newNamedGridAreas = gridTemplateAreasValue->gridArea Map();
327
328 NamedGridLinesMap namedGridColumnLines = state.style()->namedGridColumnLines ();
329 NamedGridLinesMap namedGridRowLines = state.style()->namedGridRowLines();
330 StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(newNamedGrid Areas, namedGridColumnLines, ForColumns);
331 StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(newNamedGrid Areas, namedGridRowLines, ForRows);
332 state.style()->setNamedGridColumnLines(namedGridColumnLines);
333 state.style()->setNamedGridRowLines(namedGridRowLines);
334
335 state.style()->setNamedGridArea(newNamedGridAreas);
327 state.style()->setNamedGridAreaRowCount(gridTemplateAreasValue->rowCount()); 336 state.style()->setNamedGridAreaRowCount(gridTemplateAreasValue->rowCount());
328 state.style()->setNamedGridAreaColumnCount(gridTemplateAreasValue->columnCou nt()); 337 state.style()->setNamedGridAreaColumnCount(gridTemplateAreasValue->columnCou nt());
329 } 338 }
330 339
331 void StyleBuilderFunctions::applyValueCSSPropertyLineHeight(StyleResolverState& state, CSSValue* value) 340 void StyleBuilderFunctions::applyValueCSSPropertyLineHeight(StyleResolverState& state, CSSValue* value)
332 { 341 {
333 if (!value->isPrimitiveValue()) 342 if (!value->isPrimitiveValue())
334 return; 343 return;
335 344
336 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 345 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
(...skipping 1559 matching lines...) Expand 10 before | Expand all | Expand 10 after
1896 break; 1905 break;
1897 } 1906 }
1898 case CSSPropertyEnableBackground: 1907 case CSSPropertyEnableBackground:
1899 // Silently ignoring this property for now 1908 // Silently ignoring this property for now
1900 // http://bugs.webkit.org/show_bug.cgi?id=6022 1909 // http://bugs.webkit.org/show_bug.cgi?id=6022
1901 break; 1910 break;
1902 } 1911 }
1903 } 1912 }
1904 1913
1905 } // namespace WebCore 1914 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleBuilderConverter.cpp ('k') | Source/core/rendering/style/GridCoordinate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698