Enable test_converter.py to import CSS Writing Modes test suites

Tools/Scripts/webkitpy/w3c/test_converter.py

Index: Tools/Scripts/webkitpy/w3c/test_converter.py
diff --git a/Tools/Scripts/webkitpy/w3c/test_converter.py b/Tools/Scripts/webkitpy/w3c/test_converter.py
index c784d49ffa9624d9ffee9a880cc9fe391bfd1898..cda33a123d0ac430dd0f6dfaafb90e9c4b343661 100755
--- a/Tools/Scripts/webkitpy/w3c/test_converter.py
+++ b/Tools/Scripts/webkitpy/w3c/test_converter.py
@@ -27,6 +27,7 @@
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
+import itertools
 import logging
 import re
 
@@ -75,9 +76,21 @@ class _W3CTestConverter(HTMLParser):
         self._css_property_file = self.path_from_webkit_root('Source', 'core', 'css', 'CSSProperties.in')
 
         self.prefixed_properties = self.read_webkit_prefixed_css_property_list()
-
-        self.prefixed_properties = self.read_webkit_prefixed_css_property_list()
-        prop_regex = '([\s{]|^)(' + "|".join(prop.replace('-webkit-', '') for prop in self.prefixed_properties) + ')(\s+:|:)'
+        self.prefixed_values = {
+            'unicode-bidi': ['isolate', 'isolate-override', 'plaintext']
+        }
+        self.renamed_properties = {
+            'text-combine-upright': '-webkit-text-combine'
+        }
+        self.renamed_values = {
+            'text-combine-upright': {'all': 'horizontal'}

[Dirk Pranke, 2015/05/27 22:52:59]

Is there a reason we can't just add support for the w3c's latest property names
and values instead of rewriting to use the old ones?

[kojii, 2015/05/27 23:47:38]

Replied above.

+        }

[Dirk Pranke, 2015/05/27 22:52:59]

this section could use some comments describing specifically what each field
will do, e.g.

prefixed_properties is a list of properties where we will add "-webkit-" on the
front of each name.

prefixed_values is a map of properties where the name stays the same (does it?)
but we prefix each value.

renamed_properties is a map where simply adding a prefix isn't good enough.

etc.

[kojii, 2015/05/27 23:47:38]

I'll add and re-upload, but allow me to reply as there are other points to
discuss.

+
+        prop_regex = '([\s{]|^)(' + "|".join(itertools.chain(
+            self.renamed_properties.iterkeys(),
+            self.renamed_values.iterkeys(),
+            self.prefixed_values.iterkeys(),
+            (prop.replace('-webkit-', '') for prop in self.prefixed_properties))) + ')(\s+:|:[^;]*)'
         self.prop_re = re.compile(prop_regex)
 
     def output(self):
@@ -103,8 +116,11 @@ class _W3CTestConverter(HTMLParser):
             else:
                 unprefixed_properties.add(prop.strip())
 
+        # SVG writing-mode exists, but CSS writing-mode is still prefixed
+        unprefixed_properties.discard('writing-mode')

[Dirk Pranke, 2015/05/27 22:52:59]

I don't think I understand this change; if we still want writing-mode to be
prefixed, shouldn't we fix CSSProperties.in instead? 

[kojii, 2015/05/27 23:47:38]

There are two properties, "writing-mode" and "-webkit-writing-mode". The former
is in SVG REC, and applies only within SVG context. The latter is in CSS,
applies only in HTML context. So both properties exist, but we need to prefix to
test CSS writing-mode.

In 3-6 months I'm planning to plan unprefixing CSS Writing Modes, and I need to
come up with a plan to solve this problem. This is likely to break some content,
so I need more investigation and discussion, but I'd like to make sure our
layout code is stable enough to unprefix before making decisions on the uprefix
plan, and importing tests is to help that.

One of the discussion at www-style is here:
https://lists.w3.org/Archives/Public/www-style/2015May/0150.html

[Dirk Pranke, 2015/05/28 01:25:49]

Will this likely cause problems if we import some SVG tests, then?

+
         # Ignore any prefixed properties for which an unprefixed version is supported
-        return [prop for prop in prefixed_properties if prop not in unprefixed_properties]
+        return set(prop for prop in prefixed_properties if prop not in unprefixed_properties)

[Dirk Pranke, 2015/05/27 22:52:59]

why did this change to a set() ?

[kojii, 2015/05/27 23:47:38]

Because line #139 uses "in" operator to check if the property needs prefix. It's
not needed before because all properties in regexp should be prefixed before
this change. Now we include value prefix etc. too, so we need to check whether
to prefix or not.

[Dirk Pranke, 2015/05/28 01:25:49]

Okay. `in` actually works with both lists and sets, so I think the change is not
technically needed, but it's probably a reasonable optimization, so that's fine.

 
     def add_webkit_prefix_to_unprefixed_properties(self, text):
         """ Searches |text| for instances of properties requiring the -webkit- prefix and adds the prefix to them.
@@ -115,8 +131,17 @@ class _W3CTestConverter(HTMLParser):
         text_chunks = []
         cur_pos = 0
         for m in self.prop_re.finditer(text):
-            text_chunks.extend([text[cur_pos:m.start()], m.group(1), '-webkit-', m.group(2), m.group(3)])
-            converted_properties.add(m.group(2))
+            text_chunks.extend([text[cur_pos:m.start()], m.group(1)])
+            property = m.group(2)
+            oldProperty = self.renamed_properties.get(property)
+            if oldProperty:
+                text_chunks.append(oldProperty)
+            elif property in self.prefixed_properties:
+                text_chunks.extend(['-webkit-', property])
+            else:
+                text_chunks.append(property)
+            text_chunks.append(self.add_webkit_prefix_to_unprefixed_value(property, m.group(3)))
+            converted_properties.add(property)
             cur_pos = m.end()
         text_chunks.append(text[cur_pos:])
 
@@ -126,6 +151,15 @@ class _W3CTestConverter(HTMLParser):
         # FIXME: Handle the JS versions of these properties and GetComputedStyle, too.
         return (converted_properties, ''.join(text_chunks))
 
+    def add_webkit_prefix_to_unprefixed_value(self, property, text):
+        renamed_values = self.renamed_values.get(property)
+        if renamed_values:
+            text = re.sub("|".join(renamed_values.iterkeys()), lambda m: renamed_values[m.group(0)], text)
+        prefixed_values = self.prefixed_values.get(property)
+        if prefixed_values:
+            text = re.sub("|".join(prefixed_values), lambda m: '-webkit-' + m.group(0), text)
+        return text
+
     def convert_reference_relpaths(self, text):
         """ Searches |text| for instances of files in reference_support_info and updates the relative path to be correct for the new ref file location"""