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

Side by Side Diff: Source/core/css/resolver/StyleResolver.h

Issue 719723002: applyAllProperty should not apply non-inherited properties when inheritedOnly (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 static inline CSSPropertyID lastCSSPropertyId(); 242 static inline CSSPropertyID lastCSSPropertyId();
243 template <StyleResolver::StyleApplicationPass pass> 243 template <StyleResolver::StyleApplicationPass pass>
244 static inline bool isPropertyForPass(CSSPropertyID); 244 static inline bool isPropertyForPass(CSSPropertyID);
245 template <StyleApplicationPass pass> 245 template <StyleApplicationPass pass>
246 void applyMatchedProperties(StyleResolverState&, const MatchResult&, bool im portant, int startIndex, int endIndex, bool inheritedOnly); 246 void applyMatchedProperties(StyleResolverState&, const MatchResult&, bool im portant, int startIndex, int endIndex, bool inheritedOnly);
247 template <StyleApplicationPass pass> 247 template <StyleApplicationPass pass>
248 void applyProperties(StyleResolverState&, const StylePropertySet* properties , bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelis tNone); 248 void applyProperties(StyleResolverState&, const StylePropertySet* properties , bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelis tNone);
249 template <StyleApplicationPass pass> 249 template <StyleApplicationPass pass>
250 void applyAnimatedProperties(StyleResolverState&, const WillBeHeapHashMap<CS SPropertyID, RefPtrWillBeMember<Interpolation> >&); 250 void applyAnimatedProperties(StyleResolverState&, const WillBeHeapHashMap<CS SPropertyID, RefPtrWillBeMember<Interpolation> >&);
251 template <StyleResolver::StyleApplicationPass pass> 251 template <StyleResolver::StyleApplicationPass pass>
252 void applyAllProperty(StyleResolverState&, CSSValue*); 252 void applyAllProperty(StyleResolverState&, CSSValue*, bool inheritedOnly);
253 253
254 void matchPageRules(MatchResult&, RuleSet*, bool isLeftPage, bool isFirstPag e, const String& pageName); 254 void matchPageRules(MatchResult&, RuleSet*, bool isLeftPage, bool isFirstPag e, const String& pageName);
255 void matchPageRulesForList(WillBeHeapVector<RawPtrWillBeMember<StyleRulePage > >& matchedRules, const WillBeHeapVector<RawPtrWillBeMember<StyleRulePage> >&, bool isLeftPage, bool isFirstPage, const String& pageName); 255 void matchPageRulesForList(WillBeHeapVector<RawPtrWillBeMember<StyleRulePage > >& matchedRules, const WillBeHeapVector<RawPtrWillBeMember<StyleRulePage> >&, bool isLeftPage, bool isFirstPage, const String& pageName);
256 void collectViewportRules(); 256 void collectViewportRules();
257 257
258 bool isLeftPage(int pageIndex) const; 258 bool isLeftPage(int pageIndex) const;
259 bool isRightPage(int pageIndex) const { return !isLeftPage(pageIndex); } 259 bool isRightPage(int pageIndex) const { return !isLeftPage(pageIndex); }
260 bool isFirstPage(int pageIndex) const; 260 bool isFirstPage(int pageIndex) const;
261 String pageName(int pageIndex) const; 261 String pageName(int pageIndex) const;
262 262
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 OwnPtr<StyleResolverStats> m_styleResolverStatsTotals; 304 OwnPtr<StyleResolverStats> m_styleResolverStatsTotals;
305 unsigned m_styleResolverStatsSequence; 305 unsigned m_styleResolverStatsSequence;
306 306
307 // Use only for Internals::updateStyleAndReturnAffectedElementCount. 307 // Use only for Internals::updateStyleAndReturnAffectedElementCount.
308 unsigned m_accessCount; 308 unsigned m_accessCount;
309 }; 309 };
310 310
311 } // namespace blink 311 } // namespace blink
312 312
313 #endif // StyleResolver_h 313 #endif // StyleResolver_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698