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

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.cpp

Issue 2519393002: Force adding sheets and recalc for html import re-ordering. (Closed)
Patch Set: Missing reset in resetAuthorStyle() Created 4 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
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. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * Copyright (C) 2012 Google Inc. All rights reserved. 5 * Copyright (C) 2012 Google Inc. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 137
138 for (const auto& rules : *m_treeBoundaryCrossingRuleSet) 138 for (const auto& rules : *m_treeBoundaryCrossingRuleSet)
139 features.add(rules->m_ruleSet->features()); 139 features.add(rules->m_ruleSet->features());
140 } 140 }
141 141
142 void ScopedStyleResolver::resetAuthorStyle() { 142 void ScopedStyleResolver::resetAuthorStyle() {
143 m_authorStyleSheets.clear(); 143 m_authorStyleSheets.clear();
144 m_keyframesRuleMap.clear(); 144 m_keyframesRuleMap.clear();
145 m_treeBoundaryCrossingRuleSet = nullptr; 145 m_treeBoundaryCrossingRuleSet = nullptr;
146 m_hasDeepOrShadowSelector = false; 146 m_hasDeepOrShadowSelector = false;
147 m_needsAppendAllSheets = false;
147 } 148 }
148 149
149 StyleRuleKeyframes* ScopedStyleResolver::keyframeStylesForAnimation( 150 StyleRuleKeyframes* ScopedStyleResolver::keyframeStylesForAnimation(
150 const StringImpl* animationName) { 151 const StringImpl* animationName) {
151 if (m_keyframesRuleMap.isEmpty()) 152 if (m_keyframesRuleMap.isEmpty())
152 return nullptr; 153 return nullptr;
153 154
154 KeyframesRuleMap::iterator it = m_keyframesRuleMap.find(animationName); 155 KeyframesRuleMap::iterator it = m_keyframesRuleMap.find(animationName);
155 if (it == m_keyframesRuleMap.end()) 156 if (it == m_keyframesRuleMap.end())
156 return nullptr; 157 return nullptr;
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 m_treeBoundaryCrossingRuleSet->append( 305 m_treeBoundaryCrossingRuleSet->append(
305 RuleSubSet::create(parentStyleSheet, sheetIndex, ruleSetForScope)); 306 RuleSubSet::create(parentStyleSheet, sheetIndex, ruleSetForScope));
306 } 307 }
307 308
308 DEFINE_TRACE(ScopedStyleResolver::RuleSubSet) { 309 DEFINE_TRACE(ScopedStyleResolver::RuleSubSet) {
309 visitor->trace(m_parentStyleSheet); 310 visitor->trace(m_parentStyleSheet);
310 visitor->trace(m_ruleSet); 311 visitor->trace(m_ruleSet);
311 } 312 }
312 313
313 } // namespace blink 314 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h ('k') | third_party/WebKit/Source/core/dom/StyleEngine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698