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

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

Issue 25257003: Empty @viewport should not override legacy viewport. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 2 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 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 262
263 // FIXME: Rename to reflect the purpose, like didChangeFontSize or something . 263 // FIXME: Rename to reflect the purpose, like didChangeFontSize or something .
264 void invalidateMatchedPropertiesCache(); 264 void invalidateMatchedPropertiesCache();
265 265
266 // Exposed for RenderStyle::isStyleAvilable(). 266 // Exposed for RenderStyle::isStyleAvilable().
267 static RenderStyle* styleNotYetAvailable() { return s_styleNotYetAvailable; } 267 static RenderStyle* styleNotYetAvailable() { return s_styleNotYetAvailable; }
268 268
269 // FIXME: StyleResolver should not have this member or method. 269 // FIXME: StyleResolver should not have this member or method.
270 InspectorCSSOMWrappers& inspectorCSSOMWrappers() { return m_inspectorCSSOMWr appers; } 270 InspectorCSSOMWrappers& inspectorCSSOMWrappers() { return m_inspectorCSSOMWr appers; }
271 271
272 enum ViewportOrigin { UserAgentOrigin, AuthorOrigin };
273
274 // Exposed for ScopedStyleResolver.
275 // FIXME: Likely belongs on viewportStyleResolver.
276 void collectViewportRules(RuleSet*, ViewportOrigin);
277
278 const RuleFeatureSet& ruleFeatureSet() const { return m_features; } 272 const RuleFeatureSet& ruleFeatureSet() const { return m_features; }
279 273
280 StyleSharingList& styleSharingList() { return m_styleSharingList; } 274 StyleSharingList& styleSharingList() { return m_styleSharingList; }
281 275
282 bool supportsStyleSharing(Element*); 276 bool supportsStyleSharing(Element*);
283 277
284 void addToStyleSharingList(Element*); 278 void addToStyleSharingList(Element*);
285 void clearStyleSharingList(); 279 void clearStyleSharingList();
286 280
287 #ifdef STYLE_STATS 281 #ifdef STYLE_STATS
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 PseudoId ignoreDynamicPseudo = NOPSEUDO; 379 PseudoId ignoreDynamicPseudo = NOPSEUDO;
386 if (selectorChecker.match(selectorCheckingContext, ignoreDynamicPseudo, DOMSiblingTraversalStrategy()) == SelectorChecker::SelectorMatches) 380 if (selectorChecker.match(selectorCheckingContext, ignoreDynamicPseudo, DOMSiblingTraversalStrategy()) == SelectorChecker::SelectorMatches)
387 return true; 381 return true;
388 } 382 }
389 return false; 383 return false;
390 } 384 }
391 385
392 } // namespace WebCore 386 } // namespace WebCore
393 387
394 #endif // StyleResolver_h 388 #endif // StyleResolver_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698