<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213011] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213011">213011</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-02-26 10:36:30 -0800 (Sun, 26 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make check-webkit-style do some basic validation for CSSProperties.json
https://bugs.webkit.org/show_bug.cgi?id=168874
Reviewed by Zalan Bujtas.
Do checking of the keys and the value types.
Print exceptions if they occur; previously, coding errors caused silent failure.
* Scripts/webkitpy/style/checker.py:
(CheckerDispatcher._create_checker):
* Scripts/webkitpy/style/checkers/jsonchecker.py:
(JSONFeaturesChecker.check):
(JSONCSSPropertiesChecker):
(JSONCSSPropertiesChecker.check):
(JSONCSSPropertiesChecker.validate_comment):
(JSONCSSPropertiesChecker.validate_type):
(JSONCSSPropertiesChecker.validate_boolean):
(JSONCSSPropertiesChecker.validate_string):
(JSONCSSPropertiesChecker.validate_array):
(JSONCSSPropertiesChecker.validate_codegen_properties):
(JSONCSSPropertiesChecker.check_property):
(JSONCSSPropertiesChecker.check_codegen_properties):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerpy">trunk/Tools/Scripts/webkitpy/style/checker.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckersjsoncheckerpy">trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (213010 => 213011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-02-26 18:31:13 UTC (rev 213010)
+++ trunk/Tools/ChangeLog 2017-02-26 18:36:30 UTC (rev 213011)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2017-02-25 Simon Fraser <simon.fraser@apple.com>
+
+ Make check-webkit-style do some basic validation for CSSProperties.json
+ https://bugs.webkit.org/show_bug.cgi?id=168874
+
+ Reviewed by Zalan Bujtas.
+
+ Do checking of the keys and the value types.
+
+ Print exceptions if they occur; previously, coding errors caused silent failure.
+
+ * Scripts/webkitpy/style/checker.py:
+ (CheckerDispatcher._create_checker):
+ * Scripts/webkitpy/style/checkers/jsonchecker.py:
+ (JSONFeaturesChecker.check):
+ (JSONCSSPropertiesChecker):
+ (JSONCSSPropertiesChecker.check):
+ (JSONCSSPropertiesChecker.validate_comment):
+ (JSONCSSPropertiesChecker.validate_type):
+ (JSONCSSPropertiesChecker.validate_boolean):
+ (JSONCSSPropertiesChecker.validate_string):
+ (JSONCSSPropertiesChecker.validate_array):
+ (JSONCSSPropertiesChecker.validate_codegen_properties):
+ (JSONCSSPropertiesChecker.check_property):
+ (JSONCSSPropertiesChecker.check_codegen_properties):
+
</ins><span class="cx"> 2017-02-26 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> HitTestResult's linkSuggestedFilename should sanitize download attribute
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (213010 => 213011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checker.py 2017-02-26 18:31:13 UTC (rev 213010)
+++ trunk/Tools/Scripts/webkitpy/style/checker.py 2017-02-26 18:36:30 UTC (rev 213011)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> from checkers.jsonchecker import JSONChecker
</span><span class="cx"> from checkers.jsonchecker import JSONContributorsChecker
</span><span class="cx"> from checkers.jsonchecker import JSONFeaturesChecker
</span><ins>+from checkers.jsonchecker import JSONCSSPropertiesChecker
</ins><span class="cx"> from checkers.messagesin import MessagesInChecker
</span><span class="cx"> from checkers.png import PNGChecker
</span><span class="cx"> from checkers.python import PythonChecker
</span><span class="lines">@@ -619,6 +620,8 @@
</span><span class="cx"> checker = ContributorsChecker(file_path, handle_style_error)
</span><span class="cx"> elif basename == 'features.json':
</span><span class="cx"> checker = JSONFeaturesChecker(file_path, handle_style_error)
</span><ins>+ elif basename == 'CSSProperties.json':
+ checker = JSONCSSPropertiesChecker(file_path, handle_style_error)
</ins><span class="cx"> else:
</span><span class="cx"> checker = JSONChecker(file_path, handle_style_error)
</span><span class="cx"> elif file_type == FileType.PYTHON:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckersjsoncheckerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py (213010 => 213011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py 2017-02-26 18:31:13 UTC (rev 213010)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py 2017-02-26 18:36:30 UTC (rev 213011)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> import re
</span><span class="cx"> from sets import Set
</span><span class="cx">
</span><del>-
</del><span class="cx"> class JSONChecker(object):
</span><span class="cx"> """Processes JSON lines for checking style."""
</span><span class="cx">
</span><span class="lines">@@ -107,5 +106,105 @@
</span><span class="cx"> if 'specification' in feature:
</span><span class="cx"> if feature['specification'] not in specification_name_set:
</span><span class="cx"> self._handle_style_error(0, 'json/syntax', 5, 'The feature "%s" has a specification field but no specification of that name exists.' % feature_name)
</span><del>- except:
</del><ins>+ except Exception as e:
+ print(e)
</ins><span class="cx"> pass
</span><ins>+
+
+class JSONCSSPropertiesChecker(JSONChecker):
+ """Processes CSSProperties.json"""
+
+ def check(self, lines):
+ super(JSONCSSPropertiesChecker, self).check(lines)
+
+ try:
+ properties_definition = json.loads('\n'.join(lines) + '\n')
+ if 'properties' not in properties_definition:
+ self._handle_style_error(0, 'json/syntax', 5, '"properties" key not found, the key is mandatory.')
+ return
+
+ properties = properties_definition['properties']
+ if not isinstance(properties, dict):
+ self._handle_style_error(0, 'json/syntax', 5, '"properties" is not a dictionary.')
+ return
+
+ for property_name, property_value in properties.items():
+ self.check_property(property_name, property_value)
+
+ except Exception as e:
+ print(e)
+ pass
+
+ def validate_comment(self, property_name, property_key, key, value):
+ return
+
+ def validate_type(self, property_name, property_key, key, value, expected_type):
+ if not isinstance(value, expected_type):
+ self._handle_style_error(0, 'json/syntax', 5, '"%s" in "%s" %s is not of %s.' % (key, property_name, property_key, expected_type))
+
+ def validate_boolean(self, property_name, property_key, key, value):
+ self.validate_type(property_name, property_key, key, value, bool)
+
+ def validate_string(self, property_name, property_key, key, value):
+ self.validate_type(property_name, property_key, key, value, basestring)
+
+ def validate_array(self, property_name, property_key, key, value):
+ self.validate_type(property_name, property_key, key, value, list)
+
+ def validate_codegen_properties(self, property_name, property_key, key, value):
+ if isinstance(value, list):
+ for entry in value:
+ self.check_codegen_properties(property_name, entry)
+ else:
+ self.check_codegen_properties(property_name, value)
+
+ def check_property(self, property_name, value):
+ keys_and_validators = {
+ '*': self.validate_comment,
+ 'animatable': self.validate_boolean,
+ 'inherited': self.validate_boolean,
+ 'values': self.validate_array,
+ 'codegen-properties': self.validate_codegen_properties,
+ }
+
+ for key, value in value.items():
+ if key not in keys_and_validators:
+ self._handle_style_error(0, 'json/syntax', 5, 'dictionary for property "%s" has unexpected key "%s".' % (property_name, key))
+ return
+
+ keys_and_validators[key](property_name, "", key, value)
+
+ def check_codegen_properties(self, property_name, codegen_properties):
+ if not isinstance(codegen_properties, (dict, list)):
+ self._handle_style_error(0, 'json/syntax', 5, '"codegen_properties" for property "%s" is not a dictionary or array.' % property_name)
+ return
+
+ keys_and_validators = {
+ 'aliases': self.validate_array,
+ 'auto-functions': self.validate_boolean,
+ 'conditional-converter': self.validate_string,
+ 'converter': self.validate_string,
+ 'custom': self.validate_string,
+ 'enable-if': self.validate_string,
+ 'fill-layer-property': self.validate_boolean,
+ 'font-property': self.validate_boolean,
+ 'getter': self.validate_string,
+ 'high-priority': self.validate_boolean,
+ 'initial': self.validate_string,
+ 'internal-only': self.validate_boolean,
+ 'longhands': self.validate_array,
+ 'name-for-methods': self.validate_string,
+ 'no-default-color': self.validate_boolean,
+ 'setter': self.validate_string,
+ 'skip-builder': self.validate_boolean,
+ 'skip-codegen': self.validate_boolean,
+ 'svg': self.validate_boolean,
+ 'visited-link-color-support': self.validate_boolean,
+ }
+
+ for key, value in codegen_properties.items():
+ if key not in keys_and_validators:
+ self._handle_style_error(0, 'json/syntax', 5, 'codegen_properties for property "%s" has unexpected key "%s".' % (property_name, key))
+ return
+
+ keys_and_validators[key](property_name, 'codegen_properties', key, value)
</ins></span></pre>
</div>
</div>
</body>
</html>