Source/core/css/resolver/ScopedStyleResolver.h - Issue 85693009: Get rid of Reset and ResetStyleResolverAndFontSelector.

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

Issue 85693009: Get rid of Reset and ResetStyleResolverAndFontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 years 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

« LayoutTests/fast/css/add-remove-stylesheets-minimal-recalc-style.html ('K') | « LayoutTests/fast/css/add-remove-stylesheets-minimal-recalc-style-expected.txt ('k') | Source/core/css/resolver/ScopedStyleResolver.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 * Copyright (C) 2012 Google Inc. All rights reserved.	4 * Copyright (C) 2012 Google Inc. All rights reserved.

5 *	5 *

6 * Redistribution and use in source and binary forms, with or without	6 * Redistribution and use in source and binary forms, with or without

7 * modification, are permitted provided that the following conditions	7 * modification, are permitted provided that the following conditions

8 * are met:	8 * are met:

9 * 1. Redistributions of source code must retain the above copyright	9 * 1. Redistributions of source code must retain the above copyright

10 * notice, this list of conditions and the following disclaimer.	10 * notice, this list of conditions and the following disclaimer.

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
56	56

57 public:	57 public:

58 bool checkRegionStyle(Element*);	58 bool checkRegionStyle(Element*);

59 const StyleRuleKeyframes* keyframeStylesForAnimation(const StringImpl* anima tionName);	59 const StyleRuleKeyframes* keyframeStylesForAnimation(const StringImpl* anima tionName);

60 void addKeyframeStyle(PassRefPtr<StyleRuleKeyframes>);	60 void addKeyframeStyle(PassRefPtr<StyleRuleKeyframes>);

61	61

62 void collectMatchingAuthorRules(ElementRuleCollector&, bool includeEmptyRule s, bool applyAuthorStyles, CascadeScope, CascadeOrder = ignoreCascadeOrder);	62 void collectMatchingAuthorRules(ElementRuleCollector&, bool includeEmptyRule s, bool applyAuthorStyles, CascadeScope, CascadeOrder = ignoreCascadeOrder);

63 void matchPageRules(PageRuleCollector&);	63 void matchPageRules(PageRuleCollector&);

64 void addRulesFromSheet(StyleSheetContents, const MediaQueryEvaluator&, Styl eResolver);	64 void addRulesFromSheet(StyleSheetContents, const MediaQueryEvaluator&, Styl eResolver);

65 void collectFeaturesTo(RuleFeatureSet&);	65 void collectFeaturesTo(RuleFeatureSet&);

66 void resetAuthorStyle();

67 void collectViewportRulesTo(StyleResolver*) const;	66 void collectViewportRulesTo(StyleResolver*) const;

68	67

69 private:	68 private:

70 explicit ScopedStyleResolver(ContainerNode& scopingNode) : m_scopingNode(sco pingNode), m_parent(0) { }	69 explicit ScopedStyleResolver(ContainerNode& scopingNode) : m_scopingNode(sco pingNode), m_parent(0) { }

71	70

72 RuleSet* ensureAuthorStyle();	71 RuleSet* ensureAuthorStyle();

73	72

74 ContainerNode& m_scopingNode;	73 ContainerNode& m_scopingNode;

75 ScopedStyleResolver* m_parent;	74 ScopedStyleResolver* m_parent;

76	75

77 Vector<StyleSheetContents*> m_authorStyleSheets;	76 Vector<StyleSheetContents*> m_authorStyleSheets;

78	77

79 typedef HashMap<const StringImpl*, RefPtr<StyleRuleKeyframes> > KeyframesRul eMap;	78 typedef HashMap<const StringImpl*, RefPtr<StyleRuleKeyframes> > KeyframesRul eMap;

80 KeyframesRuleMap m_keyframesRuleMap;	79 KeyframesRuleMap m_keyframesRuleMap;

81 };	80 };

82	81

83 } // namespace WebCore	82 } // namespace WebCore

84	83

85 #endif // ScopedStyleResolver_h	84 #endif // ScopedStyleResolver_h

OLD	NEW