OLD | NEW |
---|---|
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 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
423 void ScopedStyleResolver::matchPageRules(PageRuleCollector& collector) | 423 void ScopedStyleResolver::matchPageRules(PageRuleCollector& collector) |
424 { | 424 { |
425 // Only consider the global author RuleSet for @page rules, as per the HTML5 spec. | 425 // Only consider the global author RuleSet for @page rules, as per the HTML5 spec. |
426 ASSERT(m_scopingNode->isDocumentNode()); | 426 ASSERT(m_scopingNode->isDocumentNode()); |
427 collector.matchPageRules(m_authorStyle.get()); | 427 collector.matchPageRules(m_authorStyle.get()); |
428 } | 428 } |
429 | 429 |
430 void ScopedStyleResolver::collectViewportRulesTo(StyleResolver* resolver) const | 430 void ScopedStyleResolver::collectViewportRulesTo(StyleResolver* resolver) const |
431 { | 431 { |
432 if (m_authorStyle) | 432 if (m_authorStyle) |
433 resolver->collectViewportRules(m_authorStyle.get()); | 433 resolver->collectViewportRules(m_authorStyle.get(), true); |
kenneth.r.christiansen
2013/09/02 09:10:49
true? We need an enum instead
rune
2013/09/03 08:27:10
Done.
| |
434 } | 434 } |
435 | 435 |
436 } // namespace WebCore | 436 } // namespace WebCore |
OLD | NEW |