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

Side by Side Diff: Source/core/css/StyleSheetContents.cpp

Issue 963743002: Remove the warning message to inspector for dpi/dcm values (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: layout test fix + nits Created 5 years, 9 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/MediaQueryMatcher.cpp ('k') | no next file » | 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 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2006, 2007, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2006, 2007, 2012 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,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 */ 19 */
20 20
21 #include "config.h" 21 #include "config.h"
22 #include "core/css/StyleSheetContents.h" 22 #include "core/css/StyleSheetContents.h"
23 23
24 #include "core/css/CSSStyleSheet.h" 24 #include "core/css/CSSStyleSheet.h"
25 #include "core/css/MediaList.h"
26 #include "core/css/StylePropertySet.h" 25 #include "core/css/StylePropertySet.h"
27 #include "core/css/StyleRule.h" 26 #include "core/css/StyleRule.h"
28 #include "core/css/StyleRuleImport.h" 27 #include "core/css/StyleRuleImport.h"
29 #include "core/css/StyleRuleNamespace.h" 28 #include "core/css/StyleRuleNamespace.h"
30 #include "core/css/parser/CSSParser.h" 29 #include "core/css/parser/CSSParser.h"
31 #include "core/dom/Document.h" 30 #include "core/dom/Document.h"
32 #include "core/dom/Node.h" 31 #include "core/dom/Node.h"
33 #include "core/dom/StyleEngine.h" 32 #include "core/dom/StyleEngine.h"
34 #include "core/fetch/CSSStyleSheetResource.h" 33 #include "core/fetch/CSSStyleSheetResource.h"
35 #include "core/frame/UseCounter.h" 34 #include "core/frame/UseCounter.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 159
161 if (rule->isNamespaceRule()) { 160 if (rule->isNamespaceRule()) {
162 ASSERT(RuntimeEnabledFeatures::newCSSParserEnabled()); 161 ASSERT(RuntimeEnabledFeatures::newCSSParserEnabled());
163 // Parser enforces that @namespace rules come before anything else 162 // Parser enforces that @namespace rules come before anything else
164 ASSERT(m_childRules.isEmpty()); 163 ASSERT(m_childRules.isEmpty());
165 StyleRuleNamespace& namespaceRule = toStyleRuleNamespace(*rule); 164 StyleRuleNamespace& namespaceRule = toStyleRuleNamespace(*rule);
166 parserAddNamespace(namespaceRule.prefix(), namespaceRule.uri()); 165 parserAddNamespace(namespaceRule.prefix(), namespaceRule.uri());
167 return; 166 return;
168 } 167 }
169 168
170 // Add warning message to inspector if dpi/dpcm values are used for screen m edia. 169 if (rule->isMediaRule())
171 if (rule->isMediaRule()) {
172 setHasMediaQueries(); 170 setHasMediaQueries();
173 reportMediaQueryWarningIfNeeded(singleOwnerDocument(), toStyleRuleMedia( rule.get())->mediaQueries());
174 }
175 171
176 m_childRules.append(rule); 172 m_childRules.append(rule);
177 } 173 }
178 174
179 void StyleSheetContents::setHasMediaQueries() 175 void StyleSheetContents::setHasMediaQueries()
180 { 176 {
181 m_hasMediaQueries = true; 177 m_hasMediaQueries = true;
182 if (parentStyleSheet()) 178 if (parentStyleSheet())
183 parentStyleSheet()->setHasMediaQueries(); 179 parentStyleSheet()->setHasMediaQueries();
184 } 180 }
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 visitor->trace(m_ownerRule); 648 visitor->trace(m_ownerRule);
653 visitor->trace(m_importRules); 649 visitor->trace(m_importRules);
654 visitor->trace(m_childRules); 650 visitor->trace(m_childRules);
655 visitor->trace(m_loadingClients); 651 visitor->trace(m_loadingClients);
656 visitor->trace(m_completedClients); 652 visitor->trace(m_completedClients);
657 visitor->trace(m_ruleSet); 653 visitor->trace(m_ruleSet);
658 #endif 654 #endif
659 } 655 }
660 656
661 } 657 }
OLDNEW
« no previous file with comments | « Source/core/css/MediaQueryMatcher.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698