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

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

Issue 350333003: Cascade declared property values instead of applying values on top of each other (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: move functions around :| Created 6 years, 5 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) 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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 249
250 bool fastRejectSelector(const RuleData&) const; 250 bool fastRejectSelector(const RuleData&) const;
251 251
252 void applyMatchedProperties(StyleResolverState&, const MatchResult&); 252 void applyMatchedProperties(StyleResolverState&, const MatchResult&);
253 bool applyAnimatedProperties(StyleResolverState&, Element* animatingElement) ; 253 bool applyAnimatedProperties(StyleResolverState&, Element* animatingElement) ;
254 254
255 enum StyleApplicationPass { 255 enum StyleApplicationPass {
256 HighPriorityProperties, 256 HighPriorityProperties,
257 LowPriorityProperties 257 LowPriorityProperties
258 }; 258 };
259 template <StyleResolver::StyleApplicationPass pass> 259 template <StyleApplicationPass pass>
260 static inline CSSPropertyID firstCSSPropertyId(); 260 static inline CSSPropertyID firstCSSPropertyId();
261 template <StyleResolver::StyleApplicationPass pass> 261 template <StyleApplicationPass pass>
262 static inline CSSPropertyID lastCSSPropertyId(); 262 static inline CSSPropertyID lastCSSPropertyId();
263 template <StyleResolver::StyleApplicationPass pass> 263 template <StyleApplicationPass pass>
264 static inline bool isPropertyForPass(CSSPropertyID); 264 static inline bool isPropertyForPass(CSSPropertyID);
265 template <StyleApplicationPass pass> 265
266 void applyMatchedProperties(StyleResolverState&, const MatchResult&, bool im portant, int startIndex, int endIndex, bool inheritedOnly);
267 template <StyleApplicationPass pass>
268 void applyProperties(StyleResolverState&, const StylePropertySet* properties , StyleRule*, bool isImportant, bool inheritedOnly, PropertyWhitelistType = Prop ertyWhitelistNone);
269 template <StyleApplicationPass pass> 266 template <StyleApplicationPass pass>
270 void applyAnimatedProperties(StyleResolverState&, const WillBeHeapHashMap<CS SPropertyID, RefPtrWillBeMember<Interpolation> >&); 267 void applyAnimatedProperties(StyleResolverState&, const WillBeHeapHashMap<CS SPropertyID, RefPtrWillBeMember<Interpolation> >&);
271 template <StyleResolver::StyleApplicationPass pass>
272 void applyAllProperty(StyleResolverState&, CSSValue*);
273 268
274 void matchPageRules(MatchResult&, RuleSet*, bool isLeftPage, bool isFirstPag e, const String& pageName); 269 void matchPageRules(MatchResult&, RuleSet*, bool isLeftPage, bool isFirstPag e, const String& pageName);
275 void matchPageRulesForList(WillBeHeapVector<RawPtrWillBeMember<StyleRulePage > >& matchedRules, const WillBeHeapVector<RawPtrWillBeMember<StyleRulePage> >&, bool isLeftPage, bool isFirstPage, const String& pageName); 270 void matchPageRulesForList(WillBeHeapVector<RawPtrWillBeMember<StyleRulePage > >& matchedRules, const WillBeHeapVector<RawPtrWillBeMember<StyleRulePage> >&, bool isLeftPage, bool isFirstPage, const String& pageName);
276 void collectViewportRules(); 271 void collectViewportRules();
277 272
278 bool isLeftPage(int pageIndex) const; 273 bool isLeftPage(int pageIndex) const;
279 bool isRightPage(int pageIndex) const { return !isLeftPage(pageIndex); } 274 bool isRightPage(int pageIndex) const { return !isLeftPage(pageIndex); }
280 bool isFirstPage(int pageIndex) const; 275 bool isFirstPage(int pageIndex) const;
281 String pageName(int pageIndex) const; 276 String pageName(int pageIndex) const;
282 277
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 OwnPtr<StyleResolverStats> m_styleResolverStatsTotals; 320 OwnPtr<StyleResolverStats> m_styleResolverStatsTotals;
326 unsigned m_styleResolverStatsSequence; 321 unsigned m_styleResolverStatsSequence;
327 322
328 // Use only for Internals::updateStyleAndReturnAffectedElementCount. 323 // Use only for Internals::updateStyleAndReturnAffectedElementCount.
329 unsigned m_accessCount; 324 unsigned m_accessCount;
330 }; 325 };
331 326
332 } // namespace blink 327 } // namespace blink
333 328
334 #endif // StyleResolver_h 329 #endif // StyleResolver_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698