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

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

Issue 169303003: CSP 1.1: Revert CSSOM changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase. Created 6 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 | « Source/core/css/CSSKeyframesRule.h ('k') | Source/core/css/CSSKeyframesRule.idl » ('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) 2007, 2008, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/css/CSSKeyframesRule.h" 27 #include "core/css/CSSKeyframesRule.h"
28 28
29 #include "bindings/v8/ExceptionState.h"
30 #include "core/css/CSSKeyframeRule.h" 29 #include "core/css/CSSKeyframeRule.h"
31 #include "core/css/parser/BisonCSSParser.h" 30 #include "core/css/parser/BisonCSSParser.h"
32 #include "core/css/CSSRuleList.h" 31 #include "core/css/CSSRuleList.h"
33 #include "core/css/CSSStyleSheet.h" 32 #include "core/css/CSSStyleSheet.h"
34 #include "core/dom/Document.h"
35 #include "core/frame/ContentSecurityPolicy.h"
36 #include "core/frame/UseCounter.h" 33 #include "core/frame/UseCounter.h"
37 #include "wtf/text/StringBuilder.h" 34 #include "wtf/text/StringBuilder.h"
38 35
39 namespace WebCore { 36 namespace WebCore {
40 37
41 StyleRuleKeyframes::StyleRuleKeyframes() 38 StyleRuleKeyframes::StyleRuleKeyframes()
42 : StyleRuleBase(Keyframes) 39 : StyleRuleBase(Keyframes)
43 { 40 {
44 } 41 }
45 42
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 } 104 }
108 } 105 }
109 106
110 void CSSKeyframesRule::setName(const String& name) 107 void CSSKeyframesRule::setName(const String& name)
111 { 108 {
112 CSSStyleSheet::RuleMutationScope mutationScope(this); 109 CSSStyleSheet::RuleMutationScope mutationScope(this);
113 110
114 m_keyframesRule->setName(name); 111 m_keyframesRule->setName(name);
115 } 112 }
116 113
117 void CSSKeyframesRule::insertRule(const String& ruleText, ExceptionState& except ionState) 114 void CSSKeyframesRule::insertRule(const String& ruleText)
118 { 115 {
119 ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size( )); 116 ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size( ));
120 117
121 CSSStyleSheet* styleSheet = parentStyleSheet(); 118 CSSStyleSheet* styleSheet = parentStyleSheet();
122 if (styleSheet) {
123 if (Document* document = styleSheet->ownerDocument()) {
124 if (!document->contentSecurityPolicy()->allowStyleEval()) {
125 exceptionState.throwSecurityError(document->contentSecurityPolic y()->styleEvalDisabledErrorMessage());
126 return;
127 }
128 }
129 }
130
131 CSSParserContext context(parserContext(), UseCounter::getFrom(styleSheet)); 119 CSSParserContext context(parserContext(), UseCounter::getFrom(styleSheet));
132 BisonCSSParser parser(context); 120 BisonCSSParser parser(context);
133 RefPtr<StyleKeyframe> keyframe = parser.parseKeyframeRule(styleSheet ? style Sheet->contents() : 0, ruleText); 121 RefPtr<StyleKeyframe> keyframe = parser.parseKeyframeRule(styleSheet ? style Sheet->contents() : 0, ruleText);
134 if (!keyframe) 122 if (!keyframe)
135 return; 123 return;
136 124
137 CSSStyleSheet::RuleMutationScope mutationScope(this); 125 CSSStyleSheet::RuleMutationScope mutationScope(this);
138 126
139 m_keyframesRule->wrapperAppendKeyframe(keyframe); 127 m_keyframesRule->wrapperAppendKeyframe(keyframe);
140 128
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 return m_ruleListCSSOMWrapper.get(); 197 return m_ruleListCSSOMWrapper.get();
210 } 198 }
211 199
212 void CSSKeyframesRule::reattach(StyleRuleBase* rule) 200 void CSSKeyframesRule::reattach(StyleRuleBase* rule)
213 { 201 {
214 ASSERT(rule); 202 ASSERT(rule);
215 m_keyframesRule = toStyleRuleKeyframes(rule); 203 m_keyframesRule = toStyleRuleKeyframes(rule);
216 } 204 }
217 205
218 } // namespace WebCore 206 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSKeyframesRule.h ('k') | Source/core/css/CSSKeyframesRule.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698