aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/test/harness/reftest/rasterize.py31
-rw-r--r--src/test/html/ref/blank.html5
-rw-r--r--src/test/html/ref/boxes.pngbin4112 -> 0 bytes
-rw-r--r--src/test/html/ref/compute_height_width.html14
-rw-r--r--src/test/html/ref/height_compute.html14
-rw-r--r--src/test/html/ref/height_compute_reset.html15
-rw-r--r--src/test/html/ref/height_width.css10
-rw-r--r--src/test/html/ref/simple-reset.css1
-rw-r--r--src/test/html/ref/square.css2
-rw-r--r--src/test/html/ref/square.html6
-rw-r--r--src/test/html/ref/test-image.html12
-rw-r--r--src/test/ref/basic.list1
-rw-r--r--src/test/ref/height_compute.html (renamed from src/test/html/ref/height_compute.css)14
-rw-r--r--src/test/ref/height_compute_reset.html (renamed from src/test/html/ref/height_compute_reset.css)15
-rw-r--r--src/test/ref/reset.css (renamed from src/test/html/ref/reset.css)0
15 files changed, 30 insertions, 110 deletions
diff --git a/src/test/harness/reftest/rasterize.py b/src/test/harness/reftest/rasterize.py
deleted file mode 100644
index 44170e142a8..00000000000
--- a/src/test/harness/reftest/rasterize.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2013 The Servo Project Developers. See the COPYRIGHT
-# file at the top-level directory of this distribution.
-#
-# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-# option. This file may not be copied, modified, or distributed
-# except according to those terms.
-
-import sys, os
-from selenium import webdriver
-
-input = sys.argv[1]
-output = sys.argv[2]
-
-input = os.path.abspath(input)
-output = os.path.abspath(output)
-
-input = "file://" + input
-
-print input
-print output
-
-driver = webdriver.Firefox()
-
-driver.set_window_size(800, 1000)
-driver.get(input)
-
-screenshot = driver.get_screenshot_as_file(output)
-
-driver.quit()
diff --git a/src/test/html/ref/blank.html b/src/test/html/ref/blank.html
deleted file mode 100644
index eaca3f49fd1..00000000000
--- a/src/test/html/ref/blank.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-</body>
-</html>
diff --git a/src/test/html/ref/boxes.png b/src/test/html/ref/boxes.png
deleted file mode 100644
index 10119280ce1..00000000000
--- a/src/test/html/ref/boxes.png
+++ /dev/null
Binary files differ
diff --git a/src/test/html/ref/compute_height_width.html b/src/test/html/ref/compute_height_width.html
deleted file mode 100644
index 5ecbdf0330f..00000000000
--- a/src/test/html/ref/compute_height_width.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- ignore -->
-<head>
- <link rel="stylesheet" href="height_width.css" />
-</head>
-<body>
- <div class="start">
- <div class="whole"></div>
- <div class="half"></div>
- <div class="quarter"></div>
- <div class="eighth"></div>
- <div class="sixteenth"></div>
- <div class="thirtysecond"></div>
- </div>
-</body>
diff --git a/src/test/html/ref/height_compute.html b/src/test/html/ref/height_compute.html
deleted file mode 100644
index c1610bb4d91..00000000000
--- a/src/test/html/ref/height_compute.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- ignore -->
-<head>
- <link rel="stylesheet" href="height_compute.css" />
-</head>
-<body>
- <div class="start">
- <div class="half"></div>
- <div class="quarter"></div>
- <div class="eighth"></div>
- <div class="sixteenth"></div>
- <div class="thirtysecond"></div>
- <div class="sixtyfourth"></div>
- </div>
-</body>
diff --git a/src/test/html/ref/height_compute_reset.html b/src/test/html/ref/height_compute_reset.html
deleted file mode 100644
index 2440844096c..00000000000
--- a/src/test/html/ref/height_compute_reset.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- ignore -->
-<head>
- <link rel="stylesheet" href="reset.css" />
- <link rel="stylesheet" href="height_compute_reset.css" />
-</head>
-<body>
- <div class="start">
- <div class="half"></div>
- <div class="quarter"></div>
- <div class="eighth"></div>
- <div class="sixteenth"></div>
- <div class="thirtysecond"></div>
- <div class="sixtyfourth"></div>
- </div>
-</body>
diff --git a/src/test/html/ref/height_width.css b/src/test/html/ref/height_width.css
deleted file mode 100644
index 8e5f58aca10..00000000000
--- a/src/test/html/ref/height_width.css
+++ /dev/null
@@ -1,10 +0,0 @@
-div {display : inline}
-div div {width : 120px}
-.start {background-color : gray; height : 500px}
-.whole {background-color : red; height : 100%}
-.half {background-color : rgb(250, 125, 0); height : 50%}
-.quarter {background-color : yellow; height : 25%}
-.eighth {background-color : green; height : 12.5%}
-.sixteenth {background-color : blue; height : 6.25%}
-.thirtysecond {background-color : purple; height : 3.125%}
-
diff --git a/src/test/html/ref/simple-reset.css b/src/test/html/ref/simple-reset.css
deleted file mode 100644
index 09f51257adc..00000000000
--- a/src/test/html/ref/simple-reset.css
+++ /dev/null
@@ -1 +0,0 @@
-body { margin: 0px }
diff --git a/src/test/html/ref/square.css b/src/test/html/ref/square.css
deleted file mode 100644
index f07bbe0595d..00000000000
--- a/src/test/html/ref/square.css
+++ /dev/null
@@ -1,2 +0,0 @@
-body {margin : 0px}
-.box {background-color : green; height : 400px; width : 400px}
diff --git a/src/test/html/ref/square.html b/src/test/html/ref/square.html
deleted file mode 100644
index ac9ace5a979..00000000000
--- a/src/test/html/ref/square.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<head>
- <link rel="stylesheet" href="square.css" />
-</head>
-<body>
- <div class="box"></div>
-</body>
diff --git a/src/test/html/ref/test-image.html b/src/test/html/ref/test-image.html
deleted file mode 100644
index 323f00da4eb..00000000000
--- a/src/test/html/ref/test-image.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
-<!DOCTYPE html>
-<html>
-<head>
-<title>test</title>
-<link rel="stylesheet" href="simple-reset.css" />
-</head>
-<body>
-<img src="boxes.png" width="640" height="480"/>
-</body>
-</html>
-
diff --git a/src/test/ref/basic.list b/src/test/ref/basic.list
index 661974e2996..c6713e02f90 100644
--- a/src/test/ref/basic.list
+++ b/src/test/ref/basic.list
@@ -35,3 +35,4 @@
== block_image.html 500x300_green.html
# == simple_iframe.html simple_iframe_ref.html -- disabled due to iframe crashiness
== object_element_a.html object_element_b.html
+== height_compute_reset.html height_compute.html
diff --git a/src/test/html/ref/height_compute.css b/src/test/ref/height_compute.html
index 9e1c7fb9679..0f017463495 100644
--- a/src/test/html/ref/height_compute.css
+++ b/src/test/ref/height_compute.html
@@ -1,3 +1,5 @@
+<head>
+<style type="text/css">
body {margin : 0px}
.start {background-color : gray; height : 600px}
.half {background-color : red; height : 50%}
@@ -6,3 +8,15 @@ body {margin : 0px}
.sixteenth {background-color : green; height : 6.25%}
.thirtysecond {background-color : blue; height : 3.125%}
.sixtyfourth {background-color : purple; height : 1.5625%}
+</style>
+</head>
+<body>
+ <div class="start">
+ <div class="half"></div>
+ <div class="quarter"></div>
+ <div class="eighth"></div>
+ <div class="sixteenth"></div>
+ <div class="thirtysecond"></div>
+ <div class="sixtyfourth"></div>
+ </div>
+</body>
diff --git a/src/test/html/ref/height_compute_reset.css b/src/test/ref/height_compute_reset.html
index 41031e2a517..114e7ef97c2 100644
--- a/src/test/html/ref/height_compute_reset.css
+++ b/src/test/ref/height_compute_reset.html
@@ -1,3 +1,6 @@
+<head>
+<link rel="stylesheet" href="reset.css" />
+<style type="text/css">
.start {background-color : gray; height : 600px}
.half {background-color : red; height : 50%}
.quarter {background-color : rgb(250, 125, 0); height : 25%}
@@ -5,3 +8,15 @@
.sixteenth {background-color : green; height : 6.25%}
.thirtysecond {background-color : blue; height : 3.125%}
.sixtyfourth {background-color : purple; height : 1.5625%}
+</style>
+</head>
+<body>
+ <div class="start">
+ <div class="half"></div>
+ <div class="quarter"></div>
+ <div class="eighth"></div>
+ <div class="sixteenth"></div>
+ <div class="thirtysecond"></div>
+ <div class="sixtyfourth"></div>
+ </div>
+</body>
diff --git a/src/test/html/ref/reset.css b/src/test/ref/reset.css
index e5156472701..e5156472701 100644
--- a/src/test/html/ref/reset.css
+++ b/src/test/ref/reset.css