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

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

Issue 23742003: Use css-device-adapt constraining for legacy viewport tags. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Review issue: one assignent per line/statement 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
« no previous file with comments | « Source/core/css/html.css ('k') | Source/core/css/resolver/StyleResolver.h » ('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 * 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 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 void ScopedStyleResolver::matchPageRules(PageRuleCollector& collector) 421 void ScopedStyleResolver::matchPageRules(PageRuleCollector& collector)
422 { 422 {
423 // Only consider the global author RuleSet for @page rules, as per the HTML5 spec. 423 // Only consider the global author RuleSet for @page rules, as per the HTML5 spec.
424 ASSERT(m_scopingNode.isDocumentNode()); 424 ASSERT(m_scopingNode.isDocumentNode());
425 collector.matchPageRules(m_authorStyle.get()); 425 collector.matchPageRules(m_authorStyle.get());
426 } 426 }
427 427
428 void ScopedStyleResolver::collectViewportRulesTo(StyleResolver* resolver) const 428 void ScopedStyleResolver::collectViewportRulesTo(StyleResolver* resolver) const
429 { 429 {
430 if (m_authorStyle) 430 if (m_authorStyle)
431 resolver->collectViewportRules(m_authorStyle.get()); 431 resolver->collectViewportRules(m_authorStyle.get(), StyleResolver::Autho rOrigin);
432 } 432 }
433 433
434 } // namespace WebCore 434 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/html.css ('k') | Source/core/css/resolver/StyleResolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698