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

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

Issue 23742003: Use css-device-adapt constraining for legacy viewport tags. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: More review issues Created 7 years, 3 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 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 258
259 // FIXME: Rename to reflect the purpose, like didChangeFontSize or something . 259 // FIXME: Rename to reflect the purpose, like didChangeFontSize or something .
260 void invalidateMatchedPropertiesCache(); 260 void invalidateMatchedPropertiesCache();
261 261
262 // Exposed for RenderStyle::isStyleAvilable(). 262 // Exposed for RenderStyle::isStyleAvilable().
263 static RenderStyle* styleNotYetAvailable() { return s_styleNotYetAvailable; } 263 static RenderStyle* styleNotYetAvailable() { return s_styleNotYetAvailable; }
264 264
265 // FIXME: StyleResolver should not have this member or method. 265 // FIXME: StyleResolver should not have this member or method.
266 InspectorCSSOMWrappers& inspectorCSSOMWrappers() { return m_inspectorCSSOMWr appers; } 266 InspectorCSSOMWrappers& inspectorCSSOMWrappers() { return m_inspectorCSSOMWr appers; }
267 267
268 enum ViewportOrigin { UserAgentOrigin, AuthorOrigin };
269
268 // Exposed for ScopedStyleResolver. 270 // Exposed for ScopedStyleResolver.
269 // FIXME: Likely belongs on viewportStyleResolver. 271 // FIXME: Likely belongs on viewportStyleResolver.
270 void collectViewportRules(RuleSet*); 272 void collectViewportRules(RuleSet*, ViewportOrigin);
271 273
272 const RuleFeatureSet& ruleFeatureSet() const { return m_features; } 274 const RuleFeatureSet& ruleFeatureSet() const { return m_features; }
273 275
274 #ifdef STYLE_STATS 276 #ifdef STYLE_STATS
275 ALWAYS_INLINE static StyleSharingStats& styleSharingStats() { return m_style SharingStats; } 277 ALWAYS_INLINE static StyleSharingStats& styleSharingStats() { return m_style SharingStats; }
276 #endif 278 #endif
277 private: 279 private:
278 // FIXME: This should probably go away, folded into FontBuilder. 280 // FIXME: This should probably go away, folded into FontBuilder.
279 void updateFont(StyleResolverState&); 281 void updateFont(StyleResolverState&);
280 282
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 PseudoId ignoreDynamicPseudo = NOPSEUDO; 372 PseudoId ignoreDynamicPseudo = NOPSEUDO;
371 if (selectorChecker.match(selectorCheckingContext, ignoreDynamicPseudo, DOMSiblingTraversalStrategy()) == SelectorChecker::SelectorMatches) 373 if (selectorChecker.match(selectorCheckingContext, ignoreDynamicPseudo, DOMSiblingTraversalStrategy()) == SelectorChecker::SelectorMatches)
372 return true; 374 return true;
373 } 375 }
374 return false; 376 return false;
375 } 377 }
376 378
377 } // namespace WebCore 379 } // namespace WebCore
378 380
379 #endif // StyleResolver_h 381 #endif // StyleResolver_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698