<!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>[178607] 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/178607">178607</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-16 15:32:33 -0800 (Fri, 16 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Regression(<a href="http://trac.webkit.org/projects/webkit/changeset/178586">r178586</a>): Caused webkitpy.w3c.test_converter_unittest.W3CTestConverterTest.test_convert_prefixed_properties to fail
https://bugs.webkit.org/show_bug.cgi?id=140568
Reviewed by Alexey Proskuryakov.
Fix the script parsing CSSPropertyNames.in to stop splitting lines
on '=' sign. The '=' sign is also used in StyleBuilder parameters:
e.g. "Longhands=background-position-x|background-position-y".
This would confuse the script and treat this as a CSS property:
"background-position-x|background-position-y".
We now split on white space and treat the first string on the line
to be the property name (this is the syntax in this file).
* Scripts/webkitpy/w3c/test_converter.py:
(_W3CTestConverter.__init__):
(_W3CTestConverter.read_webkit_prefixed_css_property_list):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_converterpy">trunk/Tools/Scripts/webkitpy/w3c/test_converter.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (178606 => 178607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-16 23:17:45 UTC (rev 178606)
+++ trunk/Tools/ChangeLog 2015-01-16 23:32:33 UTC (rev 178607)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-01-16 Chris Dumez <cdumez@apple.com>
+
+ Regression(r178586): Caused webkitpy.w3c.test_converter_unittest.W3CTestConverterTest.test_convert_prefixed_properties to fail
+ https://bugs.webkit.org/show_bug.cgi?id=140568
+
+ Reviewed by Alexey Proskuryakov.
+
+ Fix the script parsing CSSPropertyNames.in to stop splitting lines
+ on '=' sign. The '=' sign is also used in StyleBuilder parameters:
+ e.g. "Longhands=background-position-x|background-position-y".
+ This would confuse the script and treat this as a CSS property:
+ "background-position-x|background-position-y".
+
+ We now split on white space and treat the first string on the line
+ to be the property name (this is the syntax in this file).
+
+ * Scripts/webkitpy/w3c/test_converter.py:
+ (_W3CTestConverter.__init__):
+ (_W3CTestConverter.read_webkit_prefixed_css_property_list):
+
</ins><span class="cx"> 2015-01-16 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r171968): run-safari --simulator fails to launch Safari on iOS
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_converterpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_converter.py (178606 => 178607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_converter.py 2015-01-16 23:17:45 UTC (rev 178606)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_converter.py 2015-01-16 23:32:33 UTC (rev 178607)
</span><span class="lines">@@ -75,7 +75,6 @@
</span><span class="cx"> # These settings might vary between WebKit and Blink
</span><span class="cx"> self._css_property_file = self.path_from_webkit_root('Source', 'WebCore', 'css', 'CSSPropertyNames.in')
</span><span class="cx"> self._css_property_value_file = self.path_from_webkit_root('Source', 'WebCore', 'css', 'CSSValueKeywords.in')
</span><del>- self._css_property_split_string = '='
</del><span class="cx">
</span><span class="cx"> self.test_harness_re = re.compile('/resources/testharness')
</span><span class="cx">
</span><span class="lines">@@ -99,17 +98,17 @@
</span><span class="cx"> unprefixed_properties = set()
</span><span class="cx">
</span><span class="cx"> for line in contents.splitlines():
</span><del>- if re.match('^(#|//)', line):
- # skip comments and preprocessor directives
</del><ins>+ if re.match('^(#|//)', line) or len(line.strip()) == 0:
+ # skip comments and preprocessor directives and empty lines.
</ins><span class="cx"> continue
</span><del>- fields = line.split(self._css_property_split_string)
- for prop in fields:
- # Find properties starting with the -webkit- prefix.
- match = re.match('-webkit-([\w|-]*)', prop)
- if match:
- prefixed_properties.append(match.group(1))
- else:
- unprefixed_properties.add(prop.strip())
</del><ins>+ # Property name is always first on the line.
+ property_name = line.split(' ', 1)[0]
+ # Find properties starting with the -webkit- prefix.
+ match = re.match('-webkit-([\w|-]*)', property_name)
+ if match:
+ prefixed_properties.append(match.group(1))
+ else:
+ unprefixed_properties.add(property_name.strip())
</ins><span class="cx">
</span><span class="cx"> # Ignore any prefixed properties for which an unprefixed version is supported
</span><span class="cx"> return [prop for prop in prefixed_properties if prop not in unprefixed_properties]
</span></span></pre>
</div>
</div>
</body>
</html>