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

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: Fixed a bug in parseColor uncovered by the patch Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/parser/BisonCSSParser-in.cpp ('k') | Source/core/frame/UseCounter.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "core/css/CSSGridTemplateValue.h" 52 #include "core/css/CSSGridTemplateValue.h"
53 #include "core/css/CSSHelper.h" 53 #include "core/css/CSSHelper.h"
54 #include "core/css/CSSImageSetValue.h" 54 #include "core/css/CSSImageSetValue.h"
55 #include "core/css/CSSLineBoxContainValue.h" 55 #include "core/css/CSSLineBoxContainValue.h"
56 #include "core/css/parser/BisonCSSParser.h" 56 #include "core/css/parser/BisonCSSParser.h"
57 #include "core/css/CSSPrimitiveValueMappings.h" 57 #include "core/css/CSSPrimitiveValueMappings.h"
58 #include "core/css/CSSProperty.h" 58 #include "core/css/CSSProperty.h"
59 #include "core/css/CSSReflectValue.h" 59 #include "core/css/CSSReflectValue.h"
60 #include "core/css/CSSVariableValue.h" 60 #include "core/css/CSSVariableValue.h"
61 #include "core/css/Counter.h" 61 #include "core/css/Counter.h"
62 #include "core/css/Pair.h"
62 #include "core/css/Rect.h" 63 #include "core/css/Rect.h"
63 #include "core/css/StylePropertySet.h" 64 #include "core/css/StylePropertySet.h"
64 #include "core/css/StyleRule.h" 65 #include "core/css/StyleRule.h"
65 #include "core/css/resolver/ElementStyleResources.h" 66 #include "core/css/resolver/ElementStyleResources.h"
66 #include "core/css/resolver/FilterOperationResolver.h" 67 #include "core/css/resolver/FilterOperationResolver.h"
67 #include "core/css/resolver/FontBuilder.h" 68 #include "core/css/resolver/FontBuilder.h"
68 #include "core/css/resolver/StyleBuilder.h" 69 #include "core/css/resolver/StyleBuilder.h"
69 #include "core/css/resolver/TransformBuilder.h" 70 #include "core/css/resolver/TransformBuilder.h"
70 #include "core/frame/Frame.h" 71 #include "core/frame/Frame.h"
71 #include "core/frame/Settings.h" 72 #include "core/frame/Settings.h"
(...skipping 1621 matching lines...) Expand 10 before | Expand all | Expand 10 after
1693 return; 1694 return;
1694 } 1695 }
1695 1696
1696 CSSGridTemplateValue* gridTemplateValue = toCSSGridTemplateValue(value); 1697 CSSGridTemplateValue* gridTemplateValue = toCSSGridTemplateValue(value);
1697 state.style()->setNamedGridArea(gridTemplateValue->gridAreaMap()); 1698 state.style()->setNamedGridArea(gridTemplateValue->gridAreaMap());
1698 state.style()->setNamedGridAreaRowCount(gridTemplateValue->rowCount()); 1699 state.style()->setNamedGridAreaRowCount(gridTemplateValue->rowCount());
1699 state.style()->setNamedGridAreaColumnCount(gridTemplateValue->columnCoun t()); 1700 state.style()->setNamedGridAreaColumnCount(gridTemplateValue->columnCoun t());
1700 return; 1701 return;
1701 } 1702 }
1702 1703
1704 case CSSPropertyJustifySelf: {
1705 HANDLE_INHERIT_AND_INITIAL(justifySelf, JustifySelf);
1706 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
1707 if (Pair* pairValue = primitiveValue->getPairValue()) {
1708 state.style()->setJustifySelf(*pairValue->first());
1709 state.style()->setJustifySelfOverflowAlignment(*pairValue->second()) ;
1710 } else {
1711 state.style()->setJustifySelf(*primitiveValue);
1712 }
1713 return;
1714 }
1715
1703 // These properties are aliased and we already applied the property on the p refixed version. 1716 // These properties are aliased and we already applied the property on the p refixed version.
1704 case CSSPropertyAnimationDelay: 1717 case CSSPropertyAnimationDelay:
1705 case CSSPropertyAnimationDirection: 1718 case CSSPropertyAnimationDirection:
1706 case CSSPropertyAnimationDuration: 1719 case CSSPropertyAnimationDuration:
1707 case CSSPropertyAnimationFillMode: 1720 case CSSPropertyAnimationFillMode:
1708 case CSSPropertyAnimationIterationCount: 1721 case CSSPropertyAnimationIterationCount:
1709 case CSSPropertyAnimationName: 1722 case CSSPropertyAnimationName:
1710 case CSSPropertyAnimationPlayState: 1723 case CSSPropertyAnimationPlayState:
1711 case CSSPropertyAnimationTimingFunction: 1724 case CSSPropertyAnimationTimingFunction:
1712 case CSSPropertyTransitionDelay: 1725 case CSSPropertyTransitionDelay:
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
2141 break; 2154 break;
2142 } 2155 }
2143 case CSSPropertyEnableBackground: 2156 case CSSPropertyEnableBackground:
2144 // Silently ignoring this property for now 2157 // Silently ignoring this property for now
2145 // http://bugs.webkit.org/show_bug.cgi?id=6022 2158 // http://bugs.webkit.org/show_bug.cgi?id=6022
2146 break; 2159 break;
2147 } 2160 }
2148 } 2161 }
2149 2162
2150 } // namespace WebCore 2163 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/parser/BisonCSSParser-in.cpp ('k') | Source/core/frame/UseCounter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698