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

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

Issue 14324009: Add support for disabling CSS Properties at runtime (Closed) Base URL: http://src.chromium.org/blink/trunk/Source/
Patch Set: Runtime guard more uses of CSSPropertyID, per Elliot's request. Created 7 years, 8 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/CSSParser.cpp ('k') | Source/core/css/StylePropertySet.h » ('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) 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 13 matching lines...) Expand all
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 "DOMWindowCSS.h" 31 #include "DOMWindowCSS.h"
32 32
33 #include "CSSParser.h" 33 #include "CSSParser.h"
34 #include "core/page/RuntimeCSSEnabled.h"
34 #include "StylePropertySet.h" 35 #include "StylePropertySet.h"
35 #include <wtf/text/WTFString.h> 36 #include <wtf/text/WTFString.h>
36 37
37 namespace WebCore { 38 namespace WebCore {
38 39
39 PassRefPtr<DOMWindowCSS> DOMWindowCSS::create() 40 PassRefPtr<DOMWindowCSS> DOMWindowCSS::create()
40 { 41 {
41 return adoptRef(new DOMWindowCSS()); 42 return adoptRef(new DOMWindowCSS());
42 } 43 }
43 44
44 static String valueWithoutImportant(const String& value) 45 static String valueWithoutImportant(const String& value)
45 { 46 {
46 if (!value.endsWith("important", false)) 47 if (!value.endsWith("important", false))
47 return value; 48 return value;
48 49
49 String newValue = value; 50 String newValue = value;
50 int bangIndex = newValue.length() - 9 - 1; 51 int bangIndex = newValue.length() - 9 - 1;
51 if (newValue[bangIndex] == ' ') 52 if (newValue[bangIndex] == ' ')
52 bangIndex--; 53 bangIndex--;
53 newValue = newValue.left(bangIndex); 54 newValue = newValue.left(bangIndex);
54 55
55 return newValue; 56 return newValue;
56 } 57 }
57 58
58 bool DOMWindowCSS::supports(const String& property, const String& value) const 59 bool DOMWindowCSS::supports(const String& property, const String& value) const
59 { 60 {
60 CSSPropertyID propertyID = cssPropertyID(property.stripWhiteSpace()); 61 CSSPropertyID propertyID = cssPropertyID(property.stripWhiteSpace());
62 if (propertyID == CSSPropertyInvalid)
63 return false;
61 64
62 if (propertyID == CSSPropertyInvalid) 65 if (!RuntimeCSSEnabled::isCSSPropertyEnabled(propertyID))
63 return false; 66 return false;
64 67
65 // CSSParser::parseValue() won't work correctly if !important is present, 68 // CSSParser::parseValue() won't work correctly if !important is present,
66 // so just get rid of it. It doesn't matter to supports() if it's actually 69 // so just get rid of it. It doesn't matter to supports() if it's actually
67 // there or not, provided how it's specified in the value is correct. 70 // there or not, provided how it's specified in the value is correct.
68 String normalizedValue = value.stripWhiteSpace().simplifyWhiteSpace(); 71 String normalizedValue = value.stripWhiteSpace().simplifyWhiteSpace();
69 normalizedValue = valueWithoutImportant(normalizedValue); 72 normalizedValue = valueWithoutImportant(normalizedValue);
70 73
71 if (normalizedValue.isEmpty()) 74 if (normalizedValue.isEmpty())
72 return false; 75 return false;
73 76
74 RefPtr<StylePropertySet> dummyStyle = StylePropertySet::create(); 77 RefPtr<StylePropertySet> dummyStyle = StylePropertySet::create();
75 return CSSParser::parseValue(dummyStyle.get(), propertyID, normalizedValue, false, CSSStrictMode, 0); 78 return CSSParser::parseValue(dummyStyle.get(), propertyID, normalizedValue, false, CSSStrictMode, 0);
76 } 79 }
77 80
78 bool DOMWindowCSS::supports(const String& conditionText) const 81 bool DOMWindowCSS::supports(const String& conditionText) const
79 { 82 {
80 CSSParserContext context(CSSStrictMode); 83 CSSParserContext context(CSSStrictMode);
81 CSSParser parser(context); 84 CSSParser parser(context);
82 return parser.parseSupportsCondition(conditionText); 85 return parser.parseSupportsCondition(conditionText);
83 } 86 }
84 87
85 } 88 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSParser.cpp ('k') | Source/core/css/StylePropertySet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698