Permalink
Show file tree
Hide file tree
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
[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: Canonical link: https://commits.webkit.org/171051@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@194845 268f45cc-cd09-0410-ab3c-d52691b4dbfc
- Loading branch information
Michael Catanzaro
committed
Jan 11, 2016
1 parent
bfa6881
commit b9782c7f2cc8a21daf6937db2e159f858ed99d65
Showing
6 changed files
with
88 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@@ -0,0 +1,21 @@ | ||
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@@ -0,0 +1,26 @@ | ||
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="<html xmlns="http://www.w3.org/1999/xhtml" offset="0:256"/> | ||
+ <match type="string" value="<HTML xmlns="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 | ||
|