summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzandobersek@gmail.com <zandobersek@gmail.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538>2012-12-05 17:51:34 +0000
committerzandobersek@gmail.com <zandobersek@gmail.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538>2012-12-05 17:51:34 +0000
commit91496d35737a08c28913671d7bfe41ece0e2af0a (patch)
treedb20924df407937aec8e272c90d78b99ed5345c8
parent081b7a3c9fb0d2fc831f721114f8937811f4fe7f (diff)
downloadchromium_src-91496d35737a08c28913671d7bfe41ece0e2af0a.zip
chromium_src-91496d35737a08c28913671d7bfe41ece0e2af0a.tar.gz
chromium_src-91496d35737a08c28913671d7bfe41ece0e2af0a.tar.bz2
Turn pixel tests in fast/media into reftests
https://bugs.webkit.org/show_bug.cgi?id=103632 Reviewed by Darin Adler. Turn the pixel tests under fast/media into reftests. The reference files are tailored so they present the same output that the pixel baselines. The latter will be removed in two subsequent commits. * fast/media/implicit-media-all-expected.html: Added. * fast/media/media-descriptor-syntax-01-expected.html: Added. * fast/media/media-descriptor-syntax-02-expected.html: Added. * fast/media/media-descriptor-syntax-03-expected.html: Added. * fast/media/media-descriptor-syntax-04-expected.html: Added. * fast/media/media-descriptor-syntax-05-expected.html: Added. * fast/media/media-descriptor-syntax-06-expected.html: Added. * fast/media/media-query-invalid-value-expected.html: Added. * fast/media/media-query-invalid-value-expected.txt: Removed. * fast/media/media-type-syntax-01-expected.html: Added. * fast/media/media-type-syntax-02-expected.html: Added. * fast/media/monochrome-expected.html: Added. * fast/media/mq-animation-expected.html: Added. * fast/media/mq-aspect-ratio-expected.html: Added. * fast/media/mq-compound-query-01-expected.html: Added. * fast/media/mq-compound-query-02-expected.html: Added. * fast/media/mq-compound-query-03-expected.html: Added. * fast/media/mq-compound-query-04-expected.html: Added. * fast/media/mq-compound-query-05-expected.html: Added. * fast/media/mq-grid-01-expected.html: Added. * fast/media/mq-grid-02-expected.html: Added. * fast/media/mq-invalid-media-feature-01-expected.html: Added. * fast/media/mq-invalid-media-feature-02-expected.html: Added. * fast/media/mq-invalid-media-feature-03-expected.html: Added. * fast/media/mq-invalid-media-feature-04-expected.html: Added. * fast/media/mq-invalid-syntax-01-expected.html: Added. * fast/media/mq-invalid-syntax-02-expected.html: Added. * fast/media/mq-invalid-syntax-03-expected.html: Added. * fast/media/mq-invalid-syntax-04-expected.html: Added. * fast/media/mq-invalid-syntax-05-expected.html: Added. * fast/media/mq-js-media-except-01-expected.html: Added. * fast/media/mq-js-media-except-01-expected.txt: Removed. * fast/media/mq-js-media-except-02-expected.html: Added. * fast/media/mq-js-media-except-02-expected.txt: Removed. * fast/media/mq-js-media-except-03-expected.html: Added. * fast/media/mq-js-media-except-03-expected.txt: Removed. * fast/media/mq-js-media-forward-syntax-expected.html: Added. * fast/media/mq-js-stylesheet-media-01-expected.html: Added. * fast/media/mq-js-stylesheet-media-02-expected.html: Added. * fast/media/mq-js-stylesheet-media-03-expected.html: Added. * fast/media/mq-js-stylesheet-media-04-expected.html: Added. * fast/media/mq-max-pixel-ratio-expected.html: Added. * fast/media/mq-min-constraint-expected.html: Added. * fast/media/mq-min-pixel-ratio-expected.html: Added. * fast/media/mq-min-pixel-ratio-expected.txt: Removed. * fast/media/mq-orientation-expected.html: Added. * fast/media/mq-pixel-ratio-expected.html: Added. * fast/media/mq-relative-constraints-02-expected.html: Added. * fast/media/mq-relative-constraints-03-expected.html: Added. * fast/media/mq-relative-constraints-04-expected.html: Added. * fast/media/mq-relative-constraints-05-expected.html: Added. * fast/media/mq-relative-constraints-06-expected.html: Added. * fast/media/mq-relative-constraints-07-expected.html: Added. * fast/media/mq-relative-constraints-08-expected.html: Added. * fast/media/mq-relative-constraints-08-expected.txt: Removed. * fast/media/mq-relative-constraints-09-expected.html: Added. * fast/media/mq-simple-neg-query-01-expected.html: Added. * fast/media/mq-simple-neg-query-02-expected.html: Added. * fast/media/mq-simple-neg-query-03-expected.html: Added. * fast/media/mq-simple-neg-query-04-expected.html: Added. * fast/media/mq-simple-neg-query-05-expected.html: Added. * fast/media/mq-simple-query-01-expected.html: Added. * fast/media/mq-simple-query-02-expected.html: Added. * fast/media/mq-simple-query-03-expected.html: Added. * fast/media/mq-simple-query-04-expected.html: Added. * fast/media/mq-simple-query-05-expected.html: Added. * fast/media/mq-transform-01-expected.html: Added. * fast/media/mq-transform-02-expected.html: Added. * fast/media/mq-transform-03-expected.html: Added. * fast/media/mq-transform-04-expected.html: Added. * fast/media/mq-transition-expected.html: Added. * fast/media/mq-valueless-expected.html: Added. * fast/media/mq-width-absolute-01-expected.html: Added. * fast/media/mq-width-absolute-02-expected.html: Added. * fast/media/mq-width-absolute-03-expected.html: Added. * fast/media/mq-width-absolute-04-expected.html: Added. * fast/media/view-mode-media-feature-expected.html: Added. * fast/media/view-mode-media-feature-expected.txt: Removed. * fast/media/viewport-media-query-expected.html: Added. * platform/gtk/fast/media/mq-transform-02-expected.html: Added as 3D transforms support isn't yet enabled on the GTK port. * platform/gtk/fast/media/mq-transform-03-expected.html: Ditto. git-svn-id: svn://svn.chromium.org/blink/trunk@136708 bbb929c8-8fbe-4397-9dbb-9b2b20218538
-rw-r--r--third_party/WebKit/LayoutTests/ChangeLog94
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/implicit-media-all-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-01-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-02-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-03-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-04-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-05-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-06-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/media-query-invalid-value-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/media-query-invalid-value-expected.txt6
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/media-type-syntax-01-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/media-type-syntax-02-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/monochrome-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-animation-expected.html7
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-aspect-ratio-expected.html8
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-compound-query-01-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-compound-query-02-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-compound-query-03-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-compound-query-04-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-compound-query-05-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-grid-01-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-grid-02-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-invalid-media-feature-01-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-invalid-media-feature-02-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-invalid-media-feature-03-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-invalid-media-feature-04-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-01-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-02-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-03-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-04-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-05-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-01-expected.html7
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-01-expected.txt14
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-02-expected.html6
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-02-expected.txt11
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-03-expected.html6
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-03-expected.txt11
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-js-media-forward-syntax-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-js-stylesheet-media-01-expected.html6
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-js-stylesheet-media-02-expected.html6
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-js-stylesheet-media-03-expected.html7
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-js-stylesheet-media-04-expected.html7
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-max-pixel-ratio-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-min-constraint-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-min-pixel-ratio-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-min-pixel-ratio-expected.txt6
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-orientation-expected.html7
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-pixel-ratio-expected.html6
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-02-expected.html7
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-03-expected.html7
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-04-expected.html7
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-05-expected.html7
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-06-expected.html7
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-07-expected.html7
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-08-expected.html7
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-08-expected.txt14
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-09-expected.html7
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-01-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-02-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-03-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-04-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-05-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-simple-query-01-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-simple-query-02-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-simple-query-03-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-simple-query-04-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-simple-query-05-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-transform-01-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-transform-02-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-transform-03-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-transform-04-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-transition-expected.html7
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-valueless-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-width-absolute-01-expected.html6
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-width-absolute-02-expected.html6
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-width-absolute-03-expected.html6
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/mq-width-absolute-04-expected.html6
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/view-mode-media-feature-expected.html5
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/view-mode-media-feature-expected.txt6
-rw-r--r--third_party/WebKit/LayoutTests/fast/media/viewport-media-query-expected.html9
80 files changed, 498 insertions, 68 deletions
diff --git a/third_party/WebKit/LayoutTests/ChangeLog b/third_party/WebKit/LayoutTests/ChangeLog
index 01dc688..4afa1c3 100644
--- a/third_party/WebKit/LayoutTests/ChangeLog
+++ b/third_party/WebKit/LayoutTests/ChangeLog
@@ -1,3 +1,97 @@
+2012-12-05 Zan Dobersek <zandobersek@gmail.com>
+
+ Turn pixel tests in fast/media into reftests
+ https://bugs.webkit.org/show_bug.cgi?id=103632
+
+ Reviewed by Darin Adler.
+
+ Turn the pixel tests under fast/media into reftests.
+ The reference files are tailored so they present the same output
+ that the pixel baselines. The latter will be removed in two subsequent commits.
+
+ * fast/media/implicit-media-all-expected.html: Added.
+ * fast/media/media-descriptor-syntax-01-expected.html: Added.
+ * fast/media/media-descriptor-syntax-02-expected.html: Added.
+ * fast/media/media-descriptor-syntax-03-expected.html: Added.
+ * fast/media/media-descriptor-syntax-04-expected.html: Added.
+ * fast/media/media-descriptor-syntax-05-expected.html: Added.
+ * fast/media/media-descriptor-syntax-06-expected.html: Added.
+ * fast/media/media-query-invalid-value-expected.html: Added.
+ * fast/media/media-query-invalid-value-expected.txt: Removed.
+ * fast/media/media-type-syntax-01-expected.html: Added.
+ * fast/media/media-type-syntax-02-expected.html: Added.
+ * fast/media/monochrome-expected.html: Added.
+ * fast/media/mq-animation-expected.html: Added.
+ * fast/media/mq-aspect-ratio-expected.html: Added.
+ * fast/media/mq-compound-query-01-expected.html: Added.
+ * fast/media/mq-compound-query-02-expected.html: Added.
+ * fast/media/mq-compound-query-03-expected.html: Added.
+ * fast/media/mq-compound-query-04-expected.html: Added.
+ * fast/media/mq-compound-query-05-expected.html: Added.
+ * fast/media/mq-grid-01-expected.html: Added.
+ * fast/media/mq-grid-02-expected.html: Added.
+ * fast/media/mq-invalid-media-feature-01-expected.html: Added.
+ * fast/media/mq-invalid-media-feature-02-expected.html: Added.
+ * fast/media/mq-invalid-media-feature-03-expected.html: Added.
+ * fast/media/mq-invalid-media-feature-04-expected.html: Added.
+ * fast/media/mq-invalid-syntax-01-expected.html: Added.
+ * fast/media/mq-invalid-syntax-02-expected.html: Added.
+ * fast/media/mq-invalid-syntax-03-expected.html: Added.
+ * fast/media/mq-invalid-syntax-04-expected.html: Added.
+ * fast/media/mq-invalid-syntax-05-expected.html: Added.
+ * fast/media/mq-js-media-except-01-expected.html: Added.
+ * fast/media/mq-js-media-except-01-expected.txt: Removed.
+ * fast/media/mq-js-media-except-02-expected.html: Added.
+ * fast/media/mq-js-media-except-02-expected.txt: Removed.
+ * fast/media/mq-js-media-except-03-expected.html: Added.
+ * fast/media/mq-js-media-except-03-expected.txt: Removed.
+ * fast/media/mq-js-media-forward-syntax-expected.html: Added.
+ * fast/media/mq-js-stylesheet-media-01-expected.html: Added.
+ * fast/media/mq-js-stylesheet-media-02-expected.html: Added.
+ * fast/media/mq-js-stylesheet-media-03-expected.html: Added.
+ * fast/media/mq-js-stylesheet-media-04-expected.html: Added.
+ * fast/media/mq-max-pixel-ratio-expected.html: Added.
+ * fast/media/mq-min-constraint-expected.html: Added.
+ * fast/media/mq-min-pixel-ratio-expected.html: Added.
+ * fast/media/mq-min-pixel-ratio-expected.txt: Removed.
+ * fast/media/mq-orientation-expected.html: Added.
+ * fast/media/mq-pixel-ratio-expected.html: Added.
+ * fast/media/mq-relative-constraints-02-expected.html: Added.
+ * fast/media/mq-relative-constraints-03-expected.html: Added.
+ * fast/media/mq-relative-constraints-04-expected.html: Added.
+ * fast/media/mq-relative-constraints-05-expected.html: Added.
+ * fast/media/mq-relative-constraints-06-expected.html: Added.
+ * fast/media/mq-relative-constraints-07-expected.html: Added.
+ * fast/media/mq-relative-constraints-08-expected.html: Added.
+ * fast/media/mq-relative-constraints-08-expected.txt: Removed.
+ * fast/media/mq-relative-constraints-09-expected.html: Added.
+ * fast/media/mq-simple-neg-query-01-expected.html: Added.
+ * fast/media/mq-simple-neg-query-02-expected.html: Added.
+ * fast/media/mq-simple-neg-query-03-expected.html: Added.
+ * fast/media/mq-simple-neg-query-04-expected.html: Added.
+ * fast/media/mq-simple-neg-query-05-expected.html: Added.
+ * fast/media/mq-simple-query-01-expected.html: Added.
+ * fast/media/mq-simple-query-02-expected.html: Added.
+ * fast/media/mq-simple-query-03-expected.html: Added.
+ * fast/media/mq-simple-query-04-expected.html: Added.
+ * fast/media/mq-simple-query-05-expected.html: Added.
+ * fast/media/mq-transform-01-expected.html: Added.
+ * fast/media/mq-transform-02-expected.html: Added.
+ * fast/media/mq-transform-03-expected.html: Added.
+ * fast/media/mq-transform-04-expected.html: Added.
+ * fast/media/mq-transition-expected.html: Added.
+ * fast/media/mq-valueless-expected.html: Added.
+ * fast/media/mq-width-absolute-01-expected.html: Added.
+ * fast/media/mq-width-absolute-02-expected.html: Added.
+ * fast/media/mq-width-absolute-03-expected.html: Added.
+ * fast/media/mq-width-absolute-04-expected.html: Added.
+ * fast/media/view-mode-media-feature-expected.html: Added.
+ * fast/media/view-mode-media-feature-expected.txt: Removed.
+ * fast/media/viewport-media-query-expected.html: Added.
+ * platform/gtk/fast/media/mq-transform-02-expected.html: Added as 3D transforms support
+ isn't yet enabled on the GTK port.
+ * platform/gtk/fast/media/mq-transform-03-expected.html: Ditto.
+
2012-12-05 Alexander Shalamov <alexander.shalamov@intel.com>
[EFL][GTK] List value response headers are not handled in RespourceResponse (libsoup specific)
diff --git a/third_party/WebKit/LayoutTests/fast/media/implicit-media-all-expected.html b/third_party/WebKit/LayoutTests/fast/media/implicit-media-all-expected.html
new file mode 100644
index 0000000..bbce7d9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/implicit-media-all-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<div style="width: 100px; height: 99px; background-color: green"></div>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-01-expected.html b/third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-01-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-01-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-02-expected.html b/third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-02-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-02-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-03-expected.html b/third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-03-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-03-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-04-expected.html b/third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-04-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-04-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-05-expected.html b/third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-05-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-05-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-06-expected.html b/third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-06-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/media-descriptor-syntax-06-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/media-query-invalid-value-expected.html b/third_party/WebKit/LayoutTests/fast/media/media-query-invalid-value-expected.html
new file mode 100644
index 0000000..8d688f1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/media-query-invalid-value-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<div style="width: 200px; height: 200px; background-color: green"></div>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/media-query-invalid-value-expected.txt b/third_party/WebKit/LayoutTests/fast/media/media-query-invalid-value-expected.txt
deleted file mode 100644
index 8889ba4..0000000
--- a/third_party/WebKit/LayoutTests/fast/media/media-query-invalid-value-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (0,0) size 200x200 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/fast/media/media-type-syntax-01-expected.html b/third_party/WebKit/LayoutTests/fast/media/media-type-syntax-01-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/media-type-syntax-01-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/media-type-syntax-02-expected.html b/third_party/WebKit/LayoutTests/fast/media/media-type-syntax-02-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/media-type-syntax-02-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/monochrome-expected.html b/third_party/WebKit/LayoutTests/fast/media/monochrome-expected.html
new file mode 100644
index 0000000..e155552
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/monochrome-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<div style="width: 100px; height: 100px; background-color: green"></div>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-animation-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-animation-expected.html
new file mode 100644
index 0000000..1e7e0a1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-animation-expected.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p style="color: green">This text should be green if running in a build of WebKit with animations.</p>
+<p style="color: green">This text should be green if running in a build of WebKit with animations.</p>
+<p style="color: green">This text should be green if running in a build of WebKit with animations.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-aspect-ratio-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-aspect-ratio-expected.html
new file mode 100644
index 0000000..1dec225
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-aspect-ratio-expected.html
@@ -0,0 +1,8 @@
+<html>
+<body>
+<p style="color: green">This text should be green if the viewport is 800:600 ratio. This is unlikely to happen by chance, but the layout testing sets this size</p>
+<p style="color: green">This text should be green if the viewport is landscape (minimum aspect ratio of 1:1).</p>
+<p>This text should be green if the viewport is portrait (maximum aspect ratio of 1:1).</p>
+<p>This text should be green if the viewport aspect ratio is greater than 16:9.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-compound-query-01-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-compound-query-01-expected.html
new file mode 100644
index 0000000..1926711
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-compound-query-01-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green on bitmap color devices.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-compound-query-02-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-compound-query-02-expected.html
new file mode 100644
index 0000000..1926711
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-compound-query-02-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green on bitmap color devices.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-compound-query-03-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-compound-query-03-expected.html
new file mode 100644
index 0000000..1926711
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-compound-query-03-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green on bitmap color devices.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-compound-query-04-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-compound-query-04-expected.html
new file mode 100644
index 0000000..1926711
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-compound-query-04-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green on bitmap color devices.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-compound-query-05-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-compound-query-05-expected.html
new file mode 100644
index 0000000..4cd7960
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-compound-query-05-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green if viewport is at most 800px x 600px.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-grid-01-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-grid-01-expected.html
new file mode 100644
index 0000000..babbc6b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-grid-01-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green if viewing device is bitmap device</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-grid-02-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-grid-02-expected.html
new file mode 100644
index 0000000..764786d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-grid-02-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green if viewing device is not a grid device.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-invalid-media-feature-01-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-invalid-media-feature-01-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-invalid-media-feature-01-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-invalid-media-feature-02-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-invalid-media-feature-02-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-invalid-media-feature-02-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-invalid-media-feature-03-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-invalid-media-feature-03-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-invalid-media-feature-03-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-invalid-media-feature-04-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-invalid-media-feature-04-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-invalid-media-feature-04-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-01-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-01-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-01-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-02-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-02-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-02-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-03-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-03-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-03-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-04-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-04-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-04-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-05-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-05-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-invalid-syntax-05-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-01-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-01-expected.html
new file mode 100644
index 0000000..1c806e0
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-01-expected.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>The text below should read "Success."</p>
+<p style="color: green">Success.</p>
+<p>Following exception was caught: Error: NotFoundError: DOM Exception 8</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-01-expected.txt b/third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-01-expected.txt
deleted file mode 100644
index ed1a785..0000000
--- a/third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-01-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x576
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 244x18
- text run at (0,0) width 244: "The text below should read \"Success.\""
- RenderBlock {P} at (0,34) size 784x18 [color=#008000]
- RenderText {#text} at (0,0) size 54x18
- text run at (0,0) width 54: "Success."
- RenderBlock {P} at (0,68) size 784x18
- RenderText {#text} at (0,0) size 478x18
- text run at (0,0) width 478: "Following exception was caught: Error: NotFoundError: DOM Exception 8"
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-02-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-02-expected.html
new file mode 100644
index 0000000..3970ec3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-02-expected.html
@@ -0,0 +1,6 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+<p>Caught exception: Error: SyntaxError: DOM Exception 12</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-02-expected.txt b/third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-02-expected.txt
deleted file mode 100644
index 5b4b4f9..0000000
--- a/third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-02-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x576
- RenderBlock {P} at (0,0) size 784x18 [color=#008000]
- RenderText {#text} at (0,0) size 163x19
- text run at (0,0) width 163: "This text should be green."
- RenderBlock {P} at (0,34) size 784x18
- RenderText {#text} at (0,0) size 401x19
- text run at (0,0) width 401: "Caught exception: Error: SyntaxError: DOM Exception 12"
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-03-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-03-expected.html
new file mode 100644
index 0000000..21f8afb
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-03-expected.html
@@ -0,0 +1,6 @@
+<html>
+<body>
+<p style="color: green">Success. This text should be green.</p>
+<p>Caught exception: Error: SyntaxError: DOM Exception 12</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-03-expected.txt b/third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-03-expected.txt
deleted file mode 100644
index a5119e4..0000000
--- a/third_party/WebKit/LayoutTests/fast/media/mq-js-media-except-03-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x576
- RenderBlock {P} at (0,0) size 784x18 [color=#008000]
- RenderText {#text} at (0,0) size 221x19
- text run at (0,0) width 221: "Success. This text should be green."
- RenderBlock {P} at (0,34) size 784x18
- RenderText {#text} at (0,0) size 401x19
- text run at (0,0) width 401: "Caught exception: Error: SyntaxError: DOM Exception 12"
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-js-media-forward-syntax-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-js-media-forward-syntax-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-js-media-forward-syntax-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-js-stylesheet-media-01-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-js-stylesheet-media-01-expected.html
new file mode 100644
index 0000000..d74de5d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-js-stylesheet-media-01-expected.html
@@ -0,0 +1,6 @@
+<html>
+<body>
+<p>The text below should be green and contain "braille, media, screen and (color) and (grid: 0), tty".</p>
+<p style="color: green">braille, media, screen and (color) and (grid: 0), tty</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-js-stylesheet-media-02-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-js-stylesheet-media-02-expected.html
new file mode 100644
index 0000000..d74de5d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-js-stylesheet-media-02-expected.html
@@ -0,0 +1,6 @@
+<html>
+<body>
+<p>The text below should be green and contain "braille, media, screen and (color) and (grid: 0), tty".</p>
+<p style="color: green">braille, media, screen and (color) and (grid: 0), tty</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-js-stylesheet-media-03-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-js-stylesheet-media-03-expected.html
new file mode 100644
index 0000000..932e32c
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-js-stylesheet-media-03-expected.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p style="color: green">This text should be green and below should read "braille, not screen, screen and (color)".</p>
+<p style="color: green">braille, not screen, screen and (color), not screen</p>
+<p style="color: green">expected to fail (24.07.2005)</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-js-stylesheet-media-04-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-js-stylesheet-media-04-expected.html
new file mode 100644
index 0000000..3df4e34
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-js-stylesheet-media-04-expected.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p style="color: green">This text should be green and below should read "media list is empty".</p>
+<p style="color: green">media list is empty</p>
+<p style="color: green">Expected to fail (24.7.2005)</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-max-pixel-ratio-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-max-pixel-ratio-expected.html
new file mode 100644
index 0000000..3ec1977
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-max-pixel-ratio-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green if the resolution scaling factor is 1.5 or smaller. Otherwise, it should be black.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-min-constraint-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-min-constraint-expected.html
new file mode 100644
index 0000000..b427601
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-min-constraint-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green if viewport width is at least 600px.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-min-pixel-ratio-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-min-pixel-ratio-expected.html
new file mode 100644
index 0000000..e679597
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-min-pixel-ratio-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<img src="resources/apple_logo_half_size.png">
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-min-pixel-ratio-expected.txt b/third_party/WebKit/LayoutTests/fast/media/mq-min-pixel-ratio-expected.txt
deleted file mode 100644
index eda8e01..0000000
--- a/third_party/WebKit/LayoutTests/fast/media/mq-min-pixel-ratio-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (0,0) size 320x240
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-orientation-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-orientation-expected.html
new file mode 100644
index 0000000..39e2f01
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-orientation-expected.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>This text should be green if the viewport is portrait.</p>
+<p style="color: green">This text should be green if the viewport is landscape.</p>
+<p>Obviously, at least one should be green, but never both. Square is portrait.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-pixel-ratio-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-pixel-ratio-expected.html
new file mode 100644
index 0000000..b7dba2b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-pixel-ratio-expected.html
@@ -0,0 +1,6 @@
+<html>
+<body>
+<p style="color: green">This text should be green if the resolution scaling factor is 1.0, purple if the scaling factor is 1.5,
+red if the scaling factor is 2.0, and black otherwise.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-02-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-02-expected.html
new file mode 100644
index 0000000..b777533
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-02-expected.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p style="color: green">This text should be green if viewport is wider than 30em.</p>
+<div style="width: 30em; background-color: lightblue;">div of length 30 em</div>
+<div style="width: 800px; background-color: lightblue;">div of length 800px</div>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-03-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-03-expected.html
new file mode 100644
index 0000000..b777533
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-03-expected.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p style="color: green">This text should be green if viewport is wider than 30em.</p>
+<div style="width: 30em; background-color: lightblue;">div of length 30 em</div>
+<div style="width: 800px; background-color: lightblue;">div of length 800px</div>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-04-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-04-expected.html
new file mode 100644
index 0000000..b777533
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-04-expected.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p style="color: green">This text should be green if viewport is wider than 30em.</p>
+<div style="width: 30em; background-color: lightblue;">div of length 30 em</div>
+<div style="width: 800px; background-color: lightblue;">div of length 800px</div>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-05-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-05-expected.html
new file mode 100644
index 0000000..b777533
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-05-expected.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p style="color: green">This text should be green if viewport is wider than 30em.</p>
+<div style="width: 30em; background-color: lightblue;">div of length 30 em</div>
+<div style="width: 800px; background-color: lightblue;">div of length 800px</div>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-06-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-06-expected.html
new file mode 100644
index 0000000..0cf876b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-06-expected.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p style="color: green">This text should be green if viewport is narrower than 60em. This tests that (min-width: 60em) can evaluate to false.</p>
+<div style="width: 60em; background-color: lightblue;">div of length 60 em</div>
+<div style="width: 800px; background-color: lightblue;">div of length 800px</div>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-07-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-07-expected.html
new file mode 100644
index 0000000..f7eeaaf
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-07-expected.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p style="color: green">This text should be green if viewport is wider than 30em. This tests that (max-width: 30em) can evaluate to false.</p>
+<div style="width: 30em; background-color: lightblue;">div of length 30 em</div>
+<div style="width: 800px; background-color: lightblue;">div of length 800px</div>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-08-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-08-expected.html
new file mode 100644
index 0000000..db3a15f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-08-expected.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p style="color: green">This text should be green if height is at least 30ex .</p>
+<div style="display:inline; float:left; height: 30ex; background-color: lightblue;">div of height 30ex</div>
+<div style="display:inline; float:left; height: 600px; background-color: lightblue;">div of height 600px</div>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-08-expected.txt b/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-08-expected.txt
deleted file mode 100644
index 3d51a8d..0000000
--- a/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-08-expected.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-layer at (0,0) size 785x642
- RenderView at (0,0) size 785x600
-layer at (0,0) size 785x642
- RenderBlock {HTML} at (0,0) size 785x642
- RenderBody {BODY} at (8,8) size 769x576
- RenderBlock {P} at (0,0) size 769x18 [color=#008000]
- RenderText {#text} at (0,0) size 319x19
- text run at (0,0) width 319: "This text should be green if height is at least 30ex ."
- RenderBlock (floating) {DIV} at (0,34) size 115x240 [bgcolor=#ADD8E6]
- RenderText {#text} at (0,0) size 115x19
- text run at (0,0) width 115: "div of height 30ex"
- RenderBlock (floating) {DIV} at (115,34) size 124x600 [bgcolor=#ADD8E6]
- RenderText {#text} at (0,0) size 124x19
- text run at (0,0) width 124: "div of height 600px"
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-09-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-09-expected.html
new file mode 100644
index 0000000..6fa3102
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-relative-constraints-09-expected.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p style="color: green">This text should be green if viewport is narrower than 60em.</p>
+<div style="width: 60em; background-color: lightblue;">div of length 60 em</div>
+<div style="width: 800px; background-color: lightblue;">div of length 800px</div>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-01-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-01-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-01-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-02-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-02-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-02-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-03-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-03-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-03-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-04-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-04-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-04-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-05-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-05-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-simple-neg-query-05-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-simple-query-01-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-simple-query-01-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-simple-query-01-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-simple-query-02-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-simple-query-02-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-simple-query-02-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-simple-query-03-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-simple-query-03-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-simple-query-03-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-simple-query-04-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-simple-query-04-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-simple-query-04-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-simple-query-05-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-simple-query-05-expected.html
new file mode 100644
index 0000000..3ca3799
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-simple-query-05-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-transform-01-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-transform-01-expected.html
new file mode 100644
index 0000000..12bb841
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-transform-01-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green if running in a build of WebKit with 2d transforms.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-transform-02-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-transform-02-expected.html
new file mode 100644
index 0000000..9dda26a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-transform-02-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: red">This text should be green. If running in a build of WebKit with 3d transforms, it will appear red (and this should not happen while 3d is not supported)</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-transform-03-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-transform-03-expected.html
new file mode 100644
index 0000000..cd141c1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-transform-03-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p>This text should be green if running in a build of WebKit with support for 2d but not 3d transforms.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-transform-04-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-transform-04-expected.html
new file mode 100644
index 0000000..eb908ad
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-transform-04-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green. It tests if 3d transforms are available while 2d transforms are not. This should never be possible.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-transition-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-transition-expected.html
new file mode 100644
index 0000000..567b590
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-transition-expected.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<p style="color: green">This text should be green if running in a build of WebKit with transitions.</p>
+<p style="color: green">This text should be green if running in a build of WebKit with transitions.</p>
+<p style="color: green">This text should be green if running in a build of WebKit with transitions.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-valueless-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-valueless-expected.html
new file mode 100644
index 0000000..31551e8
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-valueless-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p style="color: green">This text should be green if color display is used.</p>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-width-absolute-01-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-width-absolute-01-expected.html
new file mode 100644
index 0000000..c329102
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-width-absolute-01-expected.html
@@ -0,0 +1,6 @@
+<html>
+<body>
+<p style="color: green">This text should be green if viewport is at most 800px wide.</p>
+<div style="width: 800px; background-color:lightblue;">div of width 800px</div
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-width-absolute-02-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-width-absolute-02-expected.html
new file mode 100644
index 0000000..c329102
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-width-absolute-02-expected.html
@@ -0,0 +1,6 @@
+<html>
+<body>
+<p style="color: green">This text should be green if viewport is at most 800px wide.</p>
+<div style="width: 800px; background-color:lightblue;">div of width 800px</div
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-width-absolute-03-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-width-absolute-03-expected.html
new file mode 100644
index 0000000..c329102
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-width-absolute-03-expected.html
@@ -0,0 +1,6 @@
+<html>
+<body>
+<p style="color: green">This text should be green if viewport is at most 800px wide.</p>
+<div style="width: 800px; background-color:lightblue;">div of width 800px</div
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/mq-width-absolute-04-expected.html b/third_party/WebKit/LayoutTests/fast/media/mq-width-absolute-04-expected.html
new file mode 100644
index 0000000..c329102
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/mq-width-absolute-04-expected.html
@@ -0,0 +1,6 @@
+<html>
+<body>
+<p style="color: green">This text should be green if viewport is at most 800px wide.</p>
+<div style="width: 800px; background-color:lightblue;">div of width 800px</div
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/view-mode-media-feature-expected.html b/third_party/WebKit/LayoutTests/fast/media/view-mode-media-feature-expected.html
new file mode 100644
index 0000000..8d55e84
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/view-mode-media-feature-expected.html
@@ -0,0 +1,5 @@
+<html>
+<body style="background-color: blue">
+<div style="width: 200px; height: 200px; background-color: green"></div>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/media/view-mode-media-feature-expected.txt b/third_party/WebKit/LayoutTests/fast/media/view-mode-media-feature-expected.txt
deleted file mode 100644
index f671323..0000000
--- a/third_party/WebKit/LayoutTests/fast/media/view-mode-media-feature-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#0000FF]
- RenderBlock {DIV} at (0,0) size 200x200 [bgcolor=#008000]
diff --git a/third_party/WebKit/LayoutTests/fast/media/viewport-media-query-expected.html b/third_party/WebKit/LayoutTests/fast/media/viewport-media-query-expected.html
new file mode 100644
index 0000000..502d0fc
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/media/viewport-media-query-expected.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+You should see two iframes below. The narrow one should be black. The wider one should be green.
+<p>
+<iframe style="width: 150px; height: 150px; background-color: black"></iframe>
+<iframe style="width: 650px; height: 150px; background-color: green"></iframe>
+</p>
+</body>
+</html>