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

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

Issue 17090005: [CSS Grid Layout] Implement 'justify-self' parsing (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Scrubbed and rebaselined patch Created 7 years, 1 month 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 | Annotate | Revision Log
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 1847 matching lines...) Expand 10 before | Expand all | Expand 10 after
1858 return; 1858 return;
1859 } 1859 }
1860 1860
1861 CSSGridTemplateValue* gridTemplateValue = toCSSGridTemplateValue(value); 1861 CSSGridTemplateValue* gridTemplateValue = toCSSGridTemplateValue(value);
1862 state.style()->setNamedGridArea(gridTemplateValue->gridAreaMap()); 1862 state.style()->setNamedGridArea(gridTemplateValue->gridAreaMap());
1863 state.style()->setNamedGridAreaRowCount(gridTemplateValue->rowCount()); 1863 state.style()->setNamedGridAreaRowCount(gridTemplateValue->rowCount());
1864 state.style()->setNamedGridAreaColumnCount(gridTemplateValue->columnCoun t()); 1864 state.style()->setNamedGridAreaColumnCount(gridTemplateValue->columnCoun t());
1865 return; 1865 return;
1866 } 1866 }
1867 1867
1868 case CSSPropertyJustifySelf: {
1869 HANDLE_INHERIT_AND_INITIAL(justifySelf, JustifySelf);
1870 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
1871 if (Pair* pairValue = primitiveValue->getPairValue()) {
1872 state.style()->setJustifySelf(*pairValue->first());
1873 state.style()->setJustifySelfOverflowAlignment(*pairValue->second()) ;
1874 } else {
1875 state.style()->setJustifySelf(*primitiveValue);
1876 }
1877 return;
1878 }
1879
1868 // These properties are aliased and we already applied the property on the p refixed version. 1880 // These properties are aliased and we already applied the property on the p refixed version.
1869 case CSSPropertyAnimationDelay: 1881 case CSSPropertyAnimationDelay:
1870 case CSSPropertyAnimationDirection: 1882 case CSSPropertyAnimationDirection:
1871 case CSSPropertyAnimationDuration: 1883 case CSSPropertyAnimationDuration:
1872 case CSSPropertyAnimationFillMode: 1884 case CSSPropertyAnimationFillMode:
1873 case CSSPropertyAnimationIterationCount: 1885 case CSSPropertyAnimationIterationCount:
1874 case CSSPropertyAnimationName: 1886 case CSSPropertyAnimationName:
1875 case CSSPropertyAnimationPlayState: 1887 case CSSPropertyAnimationPlayState:
1876 case CSSPropertyAnimationTimingFunction: 1888 case CSSPropertyAnimationTimingFunction:
1877 case CSSPropertyTransitionDelay: 1889 case CSSPropertyTransitionDelay:
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
2306 break; 2318 break;
2307 } 2319 }
2308 case CSSPropertyEnableBackground: 2320 case CSSPropertyEnableBackground:
2309 // Silently ignoring this property for now 2321 // Silently ignoring this property for now
2310 // http://bugs.webkit.org/show_bug.cgi?id=6022 2322 // http://bugs.webkit.org/show_bug.cgi?id=6022
2311 break; 2323 break;
2312 } 2324 }
2313 } 2325 }
2314 2326
2315 } // namespace WebCore 2327 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698