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

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

Issue 1498473004: CSS.escape('\0') should not throw. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adding idl file changes Created 5 years 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/Source/core/css/DOMWindowCSS.h ('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 * Copyright (C) 2012 Motorola Mobility Inc. All rights reserved. 2 * Copyright (C) 2012 Motorola Mobility 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above 10 * 2. Redistributions in binary form must reproduce the above
(...skipping 12 matching lines...) Expand all
23 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 28 */
29 29
30 #include "config.h" 30 #include "config.h"
31 #include "core/css/DOMWindowCSS.h" 31 #include "core/css/DOMWindowCSS.h"
32 32
33 #include "bindings/core/v8/ExceptionState.h"
34 #include "core/css/CSSMarkup.h" 33 #include "core/css/CSSMarkup.h"
35 #include "core/css/CSSPropertyMetadata.h" 34 #include "core/css/CSSPropertyMetadata.h"
36 #include "core/css/StylePropertySet.h" 35 #include "core/css/StylePropertySet.h"
37 #include "core/css/parser/CSSParser.h" 36 #include "core/css/parser/CSSParser.h"
38 #include "core/dom/ExceptionCode.h"
39 #include "wtf/text/StringBuilder.h" 37 #include "wtf/text/StringBuilder.h"
40 #include "wtf/text/WTFString.h" 38 #include "wtf/text/WTFString.h"
41 39
42 namespace blink { 40 namespace blink {
43 41
44 bool DOMWindowCSS::supports(const String& property, const String& value) 42 bool DOMWindowCSS::supports(const String& property, const String& value)
45 { 43 {
46 CSSPropertyID unresolvedProperty = unresolvedCSSPropertyID(property); 44 CSSPropertyID unresolvedProperty = unresolvedCSSPropertyID(property);
47 if (unresolvedProperty == CSSPropertyInvalid) 45 if (unresolvedProperty == CSSPropertyInvalid)
48 return false; 46 return false;
49 ASSERT(CSSPropertyMetadata::isEnabledProperty(unresolvedProperty)); 47 ASSERT(CSSPropertyMetadata::isEnabledProperty(unresolvedProperty));
50 48
51 // This will return false when !important is present 49 // This will return false when !important is present
52 RefPtrWillBeRawPtr<MutableStylePropertySet> dummyStyle = MutableStylePropert ySet::create(HTMLStandardMode); 50 RefPtrWillBeRawPtr<MutableStylePropertySet> dummyStyle = MutableStylePropert ySet::create(HTMLStandardMode);
53 return CSSParser::parseValue(dummyStyle.get(), unresolvedProperty, value, fa lse, 0); 51 return CSSParser::parseValue(dummyStyle.get(), unresolvedProperty, value, fa lse, 0);
54 } 52 }
55 53
56 bool DOMWindowCSS::supports(const String& conditionText) 54 bool DOMWindowCSS::supports(const String& conditionText)
57 { 55 {
58 return CSSParser::parseSupportsCondition(conditionText); 56 return CSSParser::parseSupportsCondition(conditionText);
59 } 57 }
60 58
61 String DOMWindowCSS::escape(const String& ident, ExceptionState& exceptionState) 59 String DOMWindowCSS::escape(const String& ident)
62 { 60 {
63 StringBuilder builder; 61 StringBuilder builder;
64 if (!serializeIdentifier(ident, builder)) { 62 serializeIdentifier(ident, builder);
65 exceptionState.throwDOMException(InvalidCharacterError, "The string cont ains an invalid character.");
66 return String();
67 }
68 return builder.toString(); 63 return builder.toString();
69 } 64 }
70 65
71 } 66 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/DOMWindowCSS.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698