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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSPageRule.cpp

Issue 1637273003: PageRule should not serialize @page in selectorText (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: V4 Created 4 years, 10 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 | « third_party/WebKit/LayoutTests/fast/dom/css-element-attribute-js-null-expected.txt ('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 * (C) 2002-2003 Dirk Mueller (mueller@kde.org) 3 * (C) 2002-2003 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2002, 2005, 2006, 2008, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2002, 2005, 2006, 2008, 2012 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 CSSStyleDeclaration* CSSPageRule::style() const 48 CSSStyleDeclaration* CSSPageRule::style() const
49 { 49 {
50 if (!m_propertiesCSSOMWrapper) 50 if (!m_propertiesCSSOMWrapper)
51 m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_pageRu le->mutableProperties(), const_cast<CSSPageRule*>(this)); 51 m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_pageRu le->mutableProperties(), const_cast<CSSPageRule*>(this));
52 return m_propertiesCSSOMWrapper.get(); 52 return m_propertiesCSSOMWrapper.get();
53 } 53 }
54 54
55 String CSSPageRule::selectorText() const 55 String CSSPageRule::selectorText() const
56 { 56 {
57 StringBuilder text; 57 StringBuilder text;
58 text.appendLiteral("@page");
59 const CSSSelector* selector = m_pageRule->selector(); 58 const CSSSelector* selector = m_pageRule->selector();
60 if (selector) { 59 if (selector) {
61 String pageSpecification = selector->selectorText(); 60 String pageSpecification = selector->selectorText();
62 if (!pageSpecification.isEmpty() && pageSpecification != starAtom) { 61 if (!pageSpecification.isEmpty() && pageSpecification != starAtom)
rune 2016/01/28 18:15:47 starAtom? That shouldn't be allowed in @page selec
rwlbuis 2016/01/28 22:27:50 I removed it. Must be ancient code!
63 text.append(' ');
64 text.append(pageSpecification); 62 text.append(pageSpecification);
65 }
66 } 63 }
67 return text.toString(); 64 return text.toString();
68 } 65 }
69 66
70 void CSSPageRule::setSelectorText(const String& selectorText) 67 void CSSPageRule::setSelectorText(const String& selectorText)
71 { 68 {
72 CSSParserContext context(parserContext(), 0); 69 CSSParserContext context(parserContext(), 0);
73 CSSSelectorList selectorList = CSSParser::parseSelector(context, parentStyle Sheet() ? parentStyleSheet()->contents() : nullptr, selectorText); 70 CSSSelectorList selectorList = CSSParser::parseSelector(context, parentStyle Sheet() ? parentStyleSheet()->contents() : nullptr, selectorText);
74 if (!selectorList.isValid()) 71 if (!selectorList.isValid())
75 return; 72 return;
76 73
77 CSSStyleSheet::RuleMutationScope mutationScope(this); 74 CSSStyleSheet::RuleMutationScope mutationScope(this);
78 75
79 m_pageRule->wrapperAdoptSelectorList(std::move(selectorList)); 76 m_pageRule->wrapperAdoptSelectorList(std::move(selectorList));
80 } 77 }
81 78
82 String CSSPageRule::cssText() const 79 String CSSPageRule::cssText() const
83 { 80 {
84 StringBuilder result; 81 StringBuilder result;
82 result.appendLiteral("@page ");
85 result.append(selectorText()); 83 result.append(selectorText());
86 result.appendLiteral(" { "); 84 result.appendLiteral(" { ");
rune 2016/01/28 18:15:47 If selectorText() is empty, this results in a doub
rwlbuis 2016/01/28 22:27:50 Done.
87 String decls = m_pageRule->properties().asText(); 85 String decls = m_pageRule->properties().asText();
88 result.append(decls); 86 result.append(decls);
89 if (!decls.isEmpty()) 87 if (!decls.isEmpty())
90 result.append(' '); 88 result.append(' ');
91 result.append('}'); 89 result.append('}');
92 return result.toString(); 90 return result.toString();
93 } 91 }
94 92
95 void CSSPageRule::reattach(StyleRuleBase* rule) 93 void CSSPageRule::reattach(StyleRuleBase* rule)
96 { 94 {
97 ASSERT(rule); 95 ASSERT(rule);
98 m_pageRule = toStyleRulePage(rule); 96 m_pageRule = toStyleRulePage(rule);
99 if (m_propertiesCSSOMWrapper) 97 if (m_propertiesCSSOMWrapper)
100 m_propertiesCSSOMWrapper->reattach(m_pageRule->mutableProperties()); 98 m_propertiesCSSOMWrapper->reattach(m_pageRule->mutableProperties());
101 } 99 }
102 100
103 DEFINE_TRACE(CSSPageRule) 101 DEFINE_TRACE(CSSPageRule)
104 { 102 {
105 visitor->trace(m_pageRule); 103 visitor->trace(m_pageRule);
106 visitor->trace(m_propertiesCSSOMWrapper); 104 visitor->trace(m_propertiesCSSOMWrapper);
107 CSSRule::trace(visitor); 105 CSSRule::trace(visitor);
108 } 106 }
109 107
110 } // namespace blink 108 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/dom/css-element-attribute-js-null-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698