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

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

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 * Copyright (C) 2012 Google Inc. All rights reserved. 4 * Copyright (C) 2012 Google Inc. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 16 matching lines...) Expand all
27 #include "config.h" 27 #include "config.h"
28 #include "core/css/resolver/ScopedStyleResolver.h" 28 #include "core/css/resolver/ScopedStyleResolver.h"
29 29
30 #include "HTMLNames.h" 30 #include "HTMLNames.h"
31 #include "core/css/CSSStyleSheet.h" 31 #include "core/css/CSSStyleSheet.h"
32 #include "core/css/PageRuleCollector.h" 32 #include "core/css/PageRuleCollector.h"
33 #include "core/css/RuleFeature.h" 33 #include "core/css/RuleFeature.h"
34 #include "core/css/RuleSet.h" 34 #include "core/css/RuleSet.h"
35 #include "core/css/StyleRule.h" 35 #include "core/css/StyleRule.h"
36 #include "core/css/resolver/StyleResolver.h" // For MatchRequest. 36 #include "core/css/resolver/StyleResolver.h" // For MatchRequest.
37 #include "core/css/resolver/ViewportStyleResolver.h"
37 #include "core/dom/Document.h" 38 #include "core/dom/Document.h"
38 #include "core/dom/shadow/ElementShadow.h" 39 #include "core/dom/shadow/ElementShadow.h"
39 #include "core/dom/shadow/ShadowRoot.h" 40 #include "core/dom/shadow/ShadowRoot.h"
40 #include "core/html/HTMLStyleElement.h" 41 #include "core/html/HTMLStyleElement.h"
41 42
42 namespace WebCore { 43 namespace WebCore {
43 44
44 ScopedStyleResolver* ScopedStyleTree::ensureScopedStyleResolver(const ContainerN ode& scopingNode) 45 ScopedStyleResolver* ScopedStyleTree::ensureScopedStyleResolver(const ContainerN ode& scopingNode)
45 { 46 {
46 bool isNewEntry; 47 bool isNewEntry;
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 421
421 void ScopedStyleResolver::matchPageRules(PageRuleCollector& collector) 422 void ScopedStyleResolver::matchPageRules(PageRuleCollector& collector)
422 { 423 {
423 // Only consider the global author RuleSet for @page rules, as per the HTML5 spec. 424 // Only consider the global author RuleSet for @page rules, as per the HTML5 spec.
424 ASSERT(m_scopingNode.isDocumentNode()); 425 ASSERT(m_scopingNode.isDocumentNode());
425 collector.matchPageRules(m_authorStyle.get()); 426 collector.matchPageRules(m_authorStyle.get());
426 } 427 }
427 428
428 void ScopedStyleResolver::collectViewportRulesTo(StyleResolver* resolver) const 429 void ScopedStyleResolver::collectViewportRulesTo(StyleResolver* resolver) const
429 { 430 {
431 // Only consider the global author RuleSet for @viewport rules.
432 ASSERT(m_scopingNode.isDocumentNode());
430 if (m_authorStyle) 433 if (m_authorStyle)
431 resolver->collectViewportRules(m_authorStyle.get(), StyleResolver::Autho rOrigin); 434 resolver->viewportStyleResolver()->collectViewportRules(m_authorStyle.ge t(), ViewportStyleResolver::AuthorOrigin);
432 } 435 }
433 436
434 } // namespace WebCore 437 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698