<!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>[194845] trunk</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/194845">194845</a></dd>
<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>
<dt>Date</dt> <dd>2016-01-11 02:49:47 -0800 (Mon, 11 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] W3C CSS2.1 anonymous table tests are failing
https://bugs.webkit.org/show_bug.cgi?id=152455
Reviewed by Mario Sanchez Prada.
Tools:
Add shared-mime-info to the jhbuild environment, since it affects the results of layout
tests. Add upstream patches to fix detection of XHTML files.
* gtk/jhbuild.modules:
* gtk/patches/shared-mime-info-xht-glob.patch: Added.
* gtk/patches/shared-mime-info-xhtml-magic.patch: Added.
LayoutTests:
Unskip the anonymous table tests, so the bots can generate expected results. The expected
results will be committed separately.
* platform/gtk/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsgtkjhbuildmodules">trunk/Tools/gtk/jhbuild.modules</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsgtkpatchessharedmimeinfoxhtglobpatch">trunk/Tools/gtk/patches/shared-mime-info-xht-glob.patch</a></li>
<li><a href="#trunkToolsgtkpatchessharedmimeinfoxhtmlmagicpatch">trunk/Tools/gtk/patches/shared-mime-info-xhtml-magic.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194844 => 194845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-11 10:40:12 UTC (rev 194844)
+++ trunk/LayoutTests/ChangeLog 2016-01-11 10:49:47 UTC (rev 194845)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-01-11 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [GTK] W3C CSS2.1 anonymous table tests are failing
+ https://bugs.webkit.org/show_bug.cgi?id=152455
+
+ Reviewed by Mario Sanchez Prada.
+
+ Unskip the anonymous table tests, so the bots can generate expected results. The expected
+ results will be committed separately.
+
+ * platform/gtk/TestExpectations:
+
</ins><span class="cx"> 2016-01-10 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [SVG -> OTF Converter] Parsing failures cause use of incomplete fonts
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (194844 => 194845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2016-01-11 10:40:12 UTC (rev 194844)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2016-01-11 10:49:47 UTC (rev 194845)
</span><span class="lines">@@ -52,77 +52,6 @@
</span><span class="cx"> # Tests that require new results.
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx">
</span><del>-# These XHTML files are being processed as HTML files.
-# Need to fix this before we can add expectations.
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-015.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-016.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-023.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-024.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-035.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-036.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-037.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-038.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-045.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-046.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-047.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-048.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-049.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-050.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-055.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-056.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-091.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-092.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-099.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-100.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-103.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-104.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-105.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-106.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-107.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-108.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-109.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-110.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-111.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-112.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-113.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-114.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-115.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-116.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-117.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-118.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-119.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-120.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-121.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-122.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-123.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-124.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-139.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-140.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-149.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-150.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-155.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-156.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-159.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-160.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-165.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-166.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-177.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-178.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-179.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-180.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-181.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-189.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-190.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-191.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-192.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-193.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-194.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-195.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-196.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-205.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-206.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-207.xht [ Missing ]
-webkit.org/b/152455 css2.1/tables/table-anonymous-objects-208.xht [ Missing ]
</del><span class="cx">
</span><span class="cx"> #////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # Expected failures
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (194844 => 194845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-01-11 10:40:12 UTC (rev 194844)
+++ trunk/Tools/ChangeLog 2016-01-11 10:49:47 UTC (rev 194845)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-01-11 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [GTK] W3C CSS2.1 anonymous table tests are failing
+ https://bugs.webkit.org/show_bug.cgi?id=152455
+
+ Reviewed by Mario Sanchez Prada.
+
+ Add shared-mime-info to the jhbuild environment, since it affects the results of layout
+ tests. Add upstream patches to fix detection of XHTML files.
+
+ * gtk/jhbuild.modules:
+ * gtk/patches/shared-mime-info-xht-glob.patch: Added.
+ * gtk/patches/shared-mime-info-xhtml-magic.patch: Added.
+
</ins><span class="cx"> 2016-01-10 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement a sampling profiler
</span></span></pre></div>
<a id="trunkToolsgtkjhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/jhbuild.modules (194844 => 194845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/jhbuild.modules 2016-01-11 10:40:12 UTC (rev 194844)
+++ trunk/Tools/gtk/jhbuild.modules 2016-01-11 10:49:47 UTC (rev 194845)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> <dep package="gst-libav"/>
</span><span class="cx"> <dep package="openwebrtc"/>
</span><span class="cx"> <dep package="llvm"/>
</span><ins>+ <dep package="shared-mime-info"/>
</ins><span class="cx"> <if condition-set="linux">
</span><span class="cx"> <dep package="xserver"/>
</span><span class="cx"> <dep package="mesa"/>
</span><span class="lines">@@ -480,6 +481,20 @@
</span><span class="cx"> hash="sha256:74fe9fdad510c8a6666febeceb7ebafc581ef990b3afcc8c1e8b5d90b24b3461">
</span><span class="cx"> </branch>
</span><span class="cx"> </autotools>
</span><ins>+
+ <autotools id="shared-mime-info"
+ autogenargs="--disable-default-make-check">
+ <dependencies>
+ <dep package="libxml2"/>
+ <dep package="glib"/>
+ </dependencies>
+ <branch module="/~hadess/shared-mime-info-${version}.tar.xz" version="1.5"
+ repo="freedesktop.org"
+ hash="sha256:d6412840eb265bf36e61fd7b6fc6bea21b0f58cb22bed16f2ccccdd54bea4180">
+ <patch file="shared-mime-info-xht-glob.patch" strip="1"/>
+ <patch file="shared-mime-info-xhtml-magic.patch" strip="1"/>
+ </branch>
+ </autotools>
</ins><span class="cx">
</span><span class="cx"> <!-- Dependencies listed below this point are not thought to affect test results, and are only
</span><span class="cx"> included because they themselves depend on other dependencies built by jhbuild. -->
</span></span></pre></div>
<a id="trunkToolsgtkpatchessharedmimeinfoxhtglobpatch"></a>
<div class="addfile"><h4>Added: trunk/Tools/gtk/patches/shared-mime-info-xht-glob.patch (0 => 194845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/patches/shared-mime-info-xht-glob.patch (rev 0)
+++ trunk/Tools/gtk/patches/shared-mime-info-xht-glob.patch 2016-01-11 10:49:47 UTC (rev 194845)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+From 6e5818deb54fdfa70f5798fc1df1d5c3eaba42df Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 7 Jan 2016 15:48:47 +0100
+Subject: Add *.xht as a glob for XHTML files
+
+
+diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
+index dc12655..48696d9 100644
+--- a/freedesktop.org.xml.in
++++ b/freedesktop.org.xml.in
+@@ -3669,6 +3669,7 @@ command to generate the output files.
+ <sub-class-of type="application/xml"/>
+ <generic-icon name="text-html"/>
+ <glob pattern="*.xhtml"/>
++ <glob pattern="*.xht"/>
+ <root-XML namespaceURI='http://www.w3.org/1999/xhtml' localName='html'/>
+ </mime-type>
+ <mime-type type="application/zip">
+--
+cgit v0.10.2
+
</ins></span></pre></div>
<a id="trunkToolsgtkpatchessharedmimeinfoxhtmlmagicpatch"></a>
<div class="addfile"><h4>Added: trunk/Tools/gtk/patches/shared-mime-info-xhtml-magic.patch (0 => 194845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/patches/shared-mime-info-xhtml-magic.patch (rev 0)
+++ trunk/Tools/gtk/patches/shared-mime-info-xhtml-magic.patch 2016-01-11 10:49:47 UTC (rev 194845)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+From 4961dc3e48d13c0c675ad7c135419b864813ca55 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 7 Jan 2016 15:49:16 +0100
+Subject: Add magic for XHTML files
+
+
+diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
+index 48696d9..9ea2f95 100644
+--- a/freedesktop.org.xml.in
++++ b/freedesktop.org.xml.in
+@@ -3670,6 +3670,12 @@ command to generate the output files.
+ <generic-icon name="text-html"/>
+ <glob pattern="*.xhtml"/>
+ <glob pattern="*.xht"/>
++ <magic priority="60">
++ <match type="string" value="//W3C//DTD XHTML " offset="0:256"/>
++ <match type="string" value="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" offset="0:256"/>
++ <match type="string" value="&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml" offset="0:256"/>
++ <match type="string" value="&lt;HTML xmlns=&quot;http://www.w3.org/1999/xhtml" offset="0:256"/>
++ </magic>
+ <root-XML namespaceURI='http://www.w3.org/1999/xhtml' localName='html'/>
+ </mime-type>
+ <mime-type type="application/zip">
+--
+cgit v0.10.2
+
</ins></span></pre>
</div>
</div>
</body>
</html>