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

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

Issue 20672003: Avoid reaching for StyleResolver::m_features from StyleBuilder. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
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 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 337
338 bool m_matchAuthorAndUserStyles; 338 bool m_matchAuthorAndUserStyles;
339 339
340 RefPtr<CSSFontSelector> m_fontSelector; 340 RefPtr<CSSFontSelector> m_fontSelector;
341 Vector<OwnPtr<MediaQueryResult> > m_viewportDependentMediaQueryResults; 341 Vector<OwnPtr<MediaQueryResult> > m_viewportDependentMediaQueryResults;
342 342
343 RefPtr<ViewportStyleResolver> m_viewportStyleResolver; 343 RefPtr<ViewportStyleResolver> m_viewportStyleResolver;
344 344
345 ScopedStyleTree m_styleTree; 345 ScopedStyleTree m_styleTree;
346 346
347 // FIXME: The entire logic of collecting features on StyleResolver, as well astransferring them
348 // between various parts of machinery smells wrong. This needs to be better somehow.
347 RuleFeatureSet m_features; 349 RuleFeatureSet m_features;
348 OwnPtr<RuleSet> m_siblingRuleSet; 350 OwnPtr<RuleSet> m_siblingRuleSet;
349 OwnPtr<RuleSet> m_uncommonAttributeRuleSet; 351 OwnPtr<RuleSet> m_uncommonAttributeRuleSet;
350 352
351 InspectorCSSOMWrappers m_inspectorCSSOMWrappers; 353 InspectorCSSOMWrappers m_inspectorCSSOMWrappers;
352 354
353 StyleResourceLoader m_styleResourceLoader; 355 StyleResourceLoader m_styleResourceLoader;
354 356
355 #ifdef STYLE_STATS 357 #ifdef STYLE_STATS
356 static StyleSharingStats m_styleSharingStats; 358 static StyleSharingStats m_styleSharingStats;
(...skipping 14 matching lines...) Expand all
371 PseudoId ignoreDynamicPseudo = NOPSEUDO; 373 PseudoId ignoreDynamicPseudo = NOPSEUDO;
372 if (selectorChecker.match(selectorCheckingContext, ignoreDynamicPseudo, DOMSiblingTraversalStrategy()) == SelectorChecker::SelectorMatches) 374 if (selectorChecker.match(selectorCheckingContext, ignoreDynamicPseudo, DOMSiblingTraversalStrategy()) == SelectorChecker::SelectorMatches)
373 return true; 375 return true;
374 } 376 }
375 return false; 377 return false;
376 } 378 }
377 379
378 } // namespace WebCore 380 } // namespace WebCore
379 381
380 #endif // StyleResolver_h 382 #endif // StyleResolver_h
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleBuilderCustom.cpp ('k') | Source/core/css/resolver/StyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698