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

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

Issue 335313003: MediaQueryEvaluator getting mediaType from MediaValues (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added a comment Created 6 years, 6 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
« no previous file with comments | « Source/core/css/parser/SizesCalcParserTest.cpp ('k') | Source/core/html/HTMLLinkElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 : m_document(document) 132 : m_document(document)
133 , m_viewportStyleResolver(ViewportStyleResolver::create(&document)) 133 , m_viewportStyleResolver(ViewportStyleResolver::create(&document))
134 , m_needCollectFeatures(false) 134 , m_needCollectFeatures(false)
135 , m_styleResourceLoader(document.fetcher()) 135 , m_styleResourceLoader(document.fetcher())
136 , m_styleSharingDepth(0) 136 , m_styleSharingDepth(0)
137 , m_styleResolverStatsSequence(0) 137 , m_styleResolverStatsSequence(0)
138 , m_accessCount(0) 138 , m_accessCount(0)
139 { 139 {
140 FrameView* view = document.view(); 140 FrameView* view = document.view();
141 if (view) 141 if (view)
142 m_medium = adoptPtr(new MediaQueryEvaluator(view->mediaType(), &view->fr ame())); 142 m_medium = adoptPtr(new MediaQueryEvaluator(&view->frame()));
143 else 143 else
144 m_medium = adoptPtr(new MediaQueryEvaluator("all")); 144 m_medium = adoptPtr(new MediaQueryEvaluator("all"));
145 145
146 m_styleTree.clear(); 146 m_styleTree.clear();
147 147
148 initWatchedSelectorRules(CSSSelectorWatch::from(document).watchedCallbackSel ectors()); 148 initWatchedSelectorRules(CSSSelectorWatch::from(document).watchedCallbackSel ectors());
149 149
150 #if ENABLE(SVG_FONTS) 150 #if ENABLE(SVG_FONTS)
151 if (document.svgExtensions()) { 151 if (document.svgExtensions()) {
152 const WillBeHeapHashSet<RawPtrWillBeMember<SVGFontFaceElement> >& svgFon tFaceElements = document.svgExtensions()->svgFontFaceElements(); 152 const WillBeHeapHashSet<RawPtrWillBeMember<SVGFontFaceElement> >& svgFon tFaceElements = document.svgExtensions()->svgFontFaceElements();
(...skipping 1412 matching lines...) Expand 10 before | Expand all | Expand 10 after
1565 visitor->trace(m_viewportStyleResolver); 1565 visitor->trace(m_viewportStyleResolver);
1566 visitor->trace(m_features); 1566 visitor->trace(m_features);
1567 visitor->trace(m_siblingRuleSet); 1567 visitor->trace(m_siblingRuleSet);
1568 visitor->trace(m_uncommonAttributeRuleSet); 1568 visitor->trace(m_uncommonAttributeRuleSet);
1569 visitor->trace(m_watchedSelectorsRules); 1569 visitor->trace(m_watchedSelectorsRules);
1570 visitor->trace(m_treeBoundaryCrossingRules); 1570 visitor->trace(m_treeBoundaryCrossingRules);
1571 visitor->trace(m_pendingStyleSheets); 1571 visitor->trace(m_pendingStyleSheets);
1572 } 1572 }
1573 1573
1574 } // namespace WebCore 1574 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/parser/SizesCalcParserTest.cpp ('k') | Source/core/html/HTMLLinkElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698