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

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

Issue 1616423003: Fix selector namespace prefix resolution. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Corrected correction Created 4 years, 11 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 * (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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 ASSERT(!selectorTextCache().contains(this)); 88 ASSERT(!selectorTextCache().contains(this));
89 String text = generateSelectorText(); 89 String text = generateSelectorText();
90 selectorTextCache().set(this, text); 90 selectorTextCache().set(this, text);
91 setHasCachedSelectorText(true); 91 setHasCachedSelectorText(true);
92 return text; 92 return text;
93 } 93 }
94 94
95 void CSSStyleRule::setSelectorText(const String& selectorText) 95 void CSSStyleRule::setSelectorText(const String& selectorText)
96 { 96 {
97 CSSParserContext context(parserContext(), 0); 97 CSSParserContext context(parserContext(), 0);
98 CSSSelectorList selectorList = CSSParser::parseSelector(context, selectorTex t); 98 CSSSelectorList selectorList = CSSParser::parseSelector(context, parentStyle Sheet()->contents(), selectorText);
Timothy Loh 2016/01/25 00:30:47 You probably need to null-check parentStyleSheet (
rune 2016/01/25 08:58:48 Done.
99 if (!selectorList.isValid()) 99 if (!selectorList.isValid())
100 return; 100 return;
101 101
102 CSSStyleSheet::RuleMutationScope mutationScope(this); 102 CSSStyleSheet::RuleMutationScope mutationScope(this);
103 103
104 m_styleRule->wrapperAdoptSelectorList(std::move(selectorList)); 104 m_styleRule->wrapperAdoptSelectorList(std::move(selectorList));
105 105
106 if (hasCachedSelectorText()) { 106 if (hasCachedSelectorText()) {
107 selectorTextCache().remove(this); 107 selectorTextCache().remove(this);
108 setHasCachedSelectorText(false); 108 setHasCachedSelectorText(false);
(...skipping 22 matching lines...) Expand all
131 } 131 }
132 132
133 DEFINE_TRACE(CSSStyleRule) 133 DEFINE_TRACE(CSSStyleRule)
134 { 134 {
135 visitor->trace(m_styleRule); 135 visitor->trace(m_styleRule);
136 visitor->trace(m_propertiesCSSOMWrapper); 136 visitor->trace(m_propertiesCSSOMWrapper);
137 CSSRule::trace(visitor); 137 CSSRule::trace(visitor);
138 } 138 }
139 139
140 } // namespace blink 140 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698