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

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

Issue 450103005: Add inherited flag to CSSProperties.in (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: mark paint-order inherited Created 6 years, 4 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
« no previous file with comments | « Source/core/css/StylePropertySerializer.cpp ('k') | Source/core/css/resolver/StyleResolver.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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "core/css/CSSAspectRatioValue.h" 46 #include "core/css/CSSAspectRatioValue.h"
47 #include "core/css/CSSCursorImageValue.h" 47 #include "core/css/CSSCursorImageValue.h"
48 #include "core/css/CSSFontValue.h" 48 #include "core/css/CSSFontValue.h"
49 #include "core/css/CSSGradientValue.h" 49 #include "core/css/CSSGradientValue.h"
50 #include "core/css/CSSGridTemplateAreasValue.h" 50 #include "core/css/CSSGridTemplateAreasValue.h"
51 #include "core/css/CSSHelper.h" 51 #include "core/css/CSSHelper.h"
52 #include "core/css/CSSImageSetValue.h" 52 #include "core/css/CSSImageSetValue.h"
53 #include "core/css/CSSLineBoxContainValue.h" 53 #include "core/css/CSSLineBoxContainValue.h"
54 #include "core/css/parser/BisonCSSParser.h" 54 #include "core/css/parser/BisonCSSParser.h"
55 #include "core/css/CSSPrimitiveValueMappings.h" 55 #include "core/css/CSSPrimitiveValueMappings.h"
56 #include "core/css/CSSProperty.h" 56 #include "core/css/CSSPropertyMetadata.h"
57 #include "core/css/Counter.h" 57 #include "core/css/Counter.h"
58 #include "core/css/Pair.h" 58 #include "core/css/Pair.h"
59 #include "core/css/Rect.h" 59 #include "core/css/Rect.h"
60 #include "core/css/StylePropertySet.h" 60 #include "core/css/StylePropertySet.h"
61 #include "core/css/StyleRule.h" 61 #include "core/css/StyleRule.h"
62 #include "core/css/resolver/ElementStyleResources.h" 62 #include "core/css/resolver/ElementStyleResources.h"
63 #include "core/css/resolver/FilterOperationResolver.h" 63 #include "core/css/resolver/FilterOperationResolver.h"
64 #include "core/css/resolver/FontBuilder.h" 64 #include "core/css/resolver/FontBuilder.h"
65 #include "core/css/resolver/StyleBuilder.h" 65 #include "core/css/resolver/StyleBuilder.h"
66 #include "core/css/resolver/TransformBuilder.h" 66 #include "core/css/resolver/TransformBuilder.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 118
119 if (!state.applyPropertyToRegularStyle() && (!state.applyPropertyToVisitedLi nkStyle() || !isValidVisitedLinkProperty(id))) { 119 if (!state.applyPropertyToRegularStyle() && (!state.applyPropertyToVisitedLi nkStyle() || !isValidVisitedLinkProperty(id))) {
120 // Limit the properties that can be applied to only the ones honored by :visited. 120 // Limit the properties that can be applied to only the ones honored by :visited.
121 return; 121 return;
122 } 122 }
123 123
124 CSSPrimitiveValue* primitiveValue = value->isPrimitiveValue() ? toCSSPrimiti veValue(value) : 0; 124 CSSPrimitiveValue* primitiveValue = value->isPrimitiveValue() ? toCSSPrimiti veValue(value) : 0;
125 if (primitiveValue && primitiveValue->getValueID() == CSSValueCurrentcolor) 125 if (primitiveValue && primitiveValue->getValueID() == CSSValueCurrentcolor)
126 state.style()->setHasCurrentColor(); 126 state.style()->setHasCurrentColor();
127 127
128 if (isInherit && !state.parentStyle()->hasExplicitlyInheritedProperties() && !CSSProperty::isInheritedProperty(id)) 128 if (isInherit && !state.parentStyle()->hasExplicitlyInheritedProperties() && !CSSPropertyMetadata::isInheritedProperty(id))
129 state.parentStyle()->setHasExplicitlyInheritedProperties(); 129 state.parentStyle()->setHasExplicitlyInheritedProperties();
130 130
131 StyleBuilder::applyProperty(id, state, value, isInitial, isInherit); 131 StyleBuilder::applyProperty(id, state, value, isInitial, isInherit);
132 } 132 }
133 133
134 static Length clipConvertToLength(StyleResolverState& state, CSSPrimitiveValue* value) 134 static Length clipConvertToLength(StyleResolverState& state, CSSPrimitiveValue* value)
135 { 135 {
136 return value->convertToLength<FixedConversion | PercentConversion | AutoConv ersion>(state.cssToLengthConversionData()); 136 return value->convertToLength<FixedConversion | PercentConversion | AutoConv ersion>(state.cssToLengthConversionData());
137 } 137 }
138 138
(...skipping 1156 matching lines...) Expand 10 before | Expand all | Expand 10 after
1295 break; 1295 break;
1296 default: 1296 default:
1297 ASSERT_NOT_REACHED(); 1297 ASSERT_NOT_REACHED();
1298 break; 1298 break;
1299 } 1299 }
1300 1300
1301 state.style()->setGridAutoFlow(autoFlow); 1301 state.style()->setGridAutoFlow(autoFlow);
1302 } 1302 }
1303 1303
1304 } // namespace blink 1304 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/StylePropertySerializer.cpp ('k') | Source/core/css/resolver/StyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698