diff --git a/tests/wpt/web-platform-tests/tools/manifest/vcs.py b/tests/wpt/web-platform-tests/tools/manifest/vcs.py
index d98ccf90036..d87e804c359 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/vcs.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/vcs.py
@@ -61,24 +61,11 @@ class GitHasher(object):
# type: () -> Set[bytes]
"""get a set of files which have changed between HEAD and working copy"""
assert self.git is not None
-
- changes = set() # type: Set[bytes]
-
- cmd = [b"status", b"-z", b"--ignore-submodules=all"]
- data = self.git(*cmd) # type: bytes
-
- in_rename = False
- for line in data.split(b"\0")[:-1]:
- if in_rename:
- changes.add(line)
- in_rename = False
- else:
- status = line[:2]
- if b"R" in status or b"C" in status:
- in_rename = True
- changes.add(line[3:])
-
- return changes
+ # note that git runs the command with tests_root as the cwd, which may
+ # not be the root of the git repo (e.g., within a browser repo)
+ cmd = [b"diff-index", b"--relative", b"--no-renames", b"--name-only", b"-z", b"HEAD"]
+ data = self.git(*cmd)
+ return set(data.split(b"\0"))
def hash_cache(self):
# type: () -> Dict[bytes, Optional[bytes]]
@@ -90,7 +77,9 @@ class GitHasher(object):
if self.git is None:
return hash_cache
- cmd = [b"ls-tree", b"-r", b"-z", b"HEAD"]
+ # note that git runs the command with tests_root as the cwd, which may
+ # not be the root of the git repo (e.g., within a browser repo)
+ cmd = ["ls-tree", "-r", "-z", "HEAD"]
local_changes = self._local_changes()
for result in self.git(*cmd).split(b"\0")[:-1]: # type: bytes
data, rel_path = result.rsplit(b"\t", 1)
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
index 6e9991381f2..928a153dbd9 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -256,8 +256,10 @@ scheme host and port.""")
help="Path to the folder containing browser prefs")
gecko_group.add_argument("--disable-e10s", dest="gecko_e10s", action="store_false", default=True,
help="Run tests without electrolysis preferences")
- gecko_group.add_argument("--enable-webrender", dest="enable_webrender", action="store_true", default=False,
- help="Enable the WebRender compositor in Gecko.")
+ gecko_group.add_argument("--enable-webrender", dest="enable_webrender", action="store_true", default=None,
+ help="Enable the WebRender compositor in Gecko (defaults to disabled).")
+ gecko_group.add_argument("--no-enable-webrender", dest="enable_webrender", action="store_false",
+ help="Disable the WebRender compositor in Gecko.")
gecko_group.add_argument("--stackfix-dir", dest="stackfix_dir", action="store",
help="Path to directory containing assertion stack fixing scripts")
gecko_group.add_argument("--lsan-dir", dest="lsan_dir", action="store",
@@ -552,6 +554,9 @@ def check_args(kwargs):
if kwargs["reftest_screenshot"] is None:
kwargs["reftest_screenshot"] = "unexpected"
+ if kwargs["enable_webrender"] is None:
+ kwargs["enable_webrender"] = False
+
return kwargs
diff --git a/tests/wpt/web-platform-tests/user-timing/mark-entry-constructor.any.js b/tests/wpt/web-platform-tests/user-timing/mark-entry-constructor.any.js
new file mode 100644
index 00000000000..ef9c403dda6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/user-timing/mark-entry-constructor.any.js
@@ -0,0 +1,40 @@
+// META: script=resources/user-timing-helper.js
+
+test(()=>{
+ const entry = new PerformanceMark("name");
+ assert_true(entry instanceof PerformanceMark);
+ checkEntry(entry, {name: "name", entryType: "mark"});
+}, "Mark entry can be created by 'new PerformanceMark(string)'.");
+
+test(()=>{
+ const entry = new PerformanceMark("name", {});
+ assert_true(entry instanceof PerformanceMark);
+ checkEntry(entry, {name: "name", entryType: "mark"});
+}, "Mark entry can be created by 'new PerformanceMark(string, {})'.");
+
+test(()=>{
+ const entry = new PerformanceMark("name", {startTime: 1});
+ assert_true(entry instanceof PerformanceMark);
+ checkEntry(entry, {name: "name", entryType: "mark", startTime: 1});
+}, "Mark entry can be created by 'new PerformanceMark(string, {startTime})'.");
+
+test(()=>{
+ const entry = new PerformanceMark("name", {detail: {info: "abc"}});
+ assert_true(entry instanceof PerformanceMark);
+ checkEntry(entry, {name: "name", entryType: "mark", detail: {info: "abc"}});
+}, "Mark entry can be created by 'new PerformanceMark(string, {detail})'.");
+
+test(()=>{
+ const entry =
+ new PerformanceMark("name", {startTime: 1, detail: {info: "abc"}});
+ assert_true(entry instanceof PerformanceMark);
+ checkEntry(entry, {name: "name", entryType: "mark", startTime: 1, detail: {info: "abc"}});
+}, "Mark entry can be created by " +
+ "'new PerformanceMark(string, {startTime, detail})'.");
+
+test(()=>{
+ const entry = new PerformanceMark("name");
+ assert_true(entry instanceof PerformanceMark);
+ checkEntry(entry, {name: "name", entryType: "mark"});
+ assert_equals(performance.getEntriesByName("name").length, 0);
+}, "Using new PerformanceMark() shouldn't add the entry to performance timeline.");
diff --git a/tests/wpt/web-platform-tests/user-timing/mark-entry-constructor.html b/tests/wpt/web-platform-tests/user-timing/mark-entry-constructor.html
deleted file mode 100644
index 47c9a644118..00000000000
--- a/tests/wpt/web-platform-tests/user-timing/mark-entry-constructor.html
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-User Timing L3: create mark entry by constructor
-User Timing L3: create mark entry by constructor
-
-User Timing L3: Mark entry can be created by using constructor."
-
-
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/user-timing/mark-errors.any.js b/tests/wpt/web-platform-tests/user-timing/mark-errors.any.js
new file mode 100644
index 00000000000..3207d18b048
--- /dev/null
+++ b/tests/wpt/web-platform-tests/user-timing/mark-errors.any.js
@@ -0,0 +1,15 @@
+test(function() {
+ assert_throws(new TypeError(), function() { self.performance.mark("mark1", 123); }, "Number passed as a dict argument should cause type-error.")
+}, "Number should be rejected as the mark-options.")
+
+test(function() {
+ assert_throws(new TypeError(), function() { self.performance.mark("mark1", NaN); }, "NaN passed as a dict argument should cause type-error.")
+}, "NaN should be rejected as the mark-options.")
+
+test(function() {
+ assert_throws(new TypeError(), function() { self.performance.mark("mark1", Infinity); }, "Infinity passed as a dict argument should cause type-error.")
+}, "Infinity should be rejected as the mark-options.")
+
+test(function() {
+ assert_throws(new TypeError(), function() { self.performance.mark("mark1", "string"); }, "String passed as a dict argument should cause type-error.")
+}, "String should be rejected as the mark-options.")
diff --git a/tests/wpt/web-platform-tests/user-timing/mark-errors.html b/tests/wpt/web-platform-tests/user-timing/mark-errors.html
deleted file mode 100644
index c182a39c65e..00000000000
--- a/tests/wpt/web-platform-tests/user-timing/mark-errors.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-UserTimingL3: errors are thrown when mark() is called incorrectly.
-
-
-UserTimingL3: Mark
-
diff --git a/tests/wpt/web-platform-tests/user-timing/mark-l3.html b/tests/wpt/web-platform-tests/user-timing/mark-l3.any.js
similarity index 84%
rename from tests/wpt/web-platform-tests/user-timing/mark-l3.html
rename to tests/wpt/web-platform-tests/user-timing/mark-l3.any.js
index bb4b22510c7..407a5c8bba6 100644
--- a/tests/wpt/web-platform-tests/user-timing/mark-l3.html
+++ b/tests/wpt/web-platform-tests/user-timing/mark-l3.any.js
@@ -1,11 +1,6 @@
-
-
-User Timing L3: mark
-
-
-
-
+}, "mark entries' detail and startTime are customizable.");
diff --git a/tests/wpt/web-platform-tests/user-timing/mark-measure-return-objects.any.js b/tests/wpt/web-platform-tests/user-timing/mark-measure-return-objects.any.js
new file mode 100644
index 00000000000..fa45388d7b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/user-timing/mark-measure-return-objects.any.js
@@ -0,0 +1,37 @@
+async_test(function (t) {
+ self.performance.clearMeasures();
+ const measure = self.performance.measure("measure1");
+ assert_true(measure instanceof PerformanceMeasure);
+ t.done();
+}, "L3: performance.measure(name) should return an entry.");
+
+async_test(function (t) {
+ self.performance.clearMeasures();
+ const measure = self.performance.measure("measure2",
+ { startTime: 12, endTime:23 });
+ assert_true(measure instanceof PerformanceMeasure);
+ t.done();
+}, "L3: performance.measure(name, param1) should return an entry.");
+
+async_test(function (t) {
+ self.performance.clearMeasures();
+ self.performance.mark("1");
+ self.performance.mark("2");
+ const measure = self.performance.measure("measure3", "1", "2");
+ assert_true(measure instanceof PerformanceMeasure);
+ t.done();
+}, "L3: performance.measure(name, param1, param2) should return an entry.");
+
+async_test(function (t) {
+ self.performance.clearMarks();
+ const mark = self.performance.mark("mark1");
+ assert_true(mark instanceof PerformanceMark);
+ t.done();
+}, "L3: performance.mark(name) should return an entry.");
+
+async_test(function (t) {
+ self.performance.clearMarks();
+ const mark = self.performance.mark("mark2", { startTime: 34 });
+ assert_true(mark instanceof PerformanceMark);
+ t.done();
+}, "L3: performance.mark(name, param) should return an entry.");
diff --git a/tests/wpt/web-platform-tests/user-timing/mark-measure-return-objects.html b/tests/wpt/web-platform-tests/user-timing/mark-measure-return-objects.html
deleted file mode 100644
index d2d8cc3c70e..00000000000
--- a/tests/wpt/web-platform-tests/user-timing/mark-measure-return-objects.html
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-UserTiming L3: mark/measure methods return objects.
-
-
-Custom User Timing: L3 API returns a mark/measure object
-
-
diff --git a/tests/wpt/web-platform-tests/user-timing/measure-l3.any.js b/tests/wpt/web-platform-tests/user-timing/measure-l3.any.js
new file mode 100644
index 00000000000..24c27c48351
--- /dev/null
+++ b/tests/wpt/web-platform-tests/user-timing/measure-l3.any.js
@@ -0,0 +1,35 @@
+// META: script=resources/user-timing-helper.js
+
+function endTime(entry) {
+ return entry.startTime + entry.duration;
+}
+
+test(function() {
+ performance.clearMarks();
+ performance.clearMeasures();
+ const markEntry = performance.mark("mark", {startTime: 123});
+ const measureEntry = performance.measure("A", undefined, "mark");
+ assert_equals(measureEntry.startTime, 0);
+ assert_equals(endTime(measureEntry), markEntry.startTime);
+}, "When the end mark is given and the start is unprovided, the end time of the measure entry should be the end mark's time, the start time should be 0.");
+
+test(function() {
+ performance.clearMarks();
+ performance.clearMeasures();
+ const markEntry = performance.mark("mark", {startTime: 123});
+ const endMin = performance.now();
+ const measureEntry = performance.measure("A", "mark", undefined);
+ const endMax = performance.now();
+ assert_equals(measureEntry.startTime, markEntry.startTime);
+ assert_greater_than_equal(endTime(measureEntry), endMin);
+ assert_greater_than_equal(endMax, endTime(measureEntry));
+}, "When the start mark is given and the end is unprovided, the start time of the measure entry should be the start mark's time, the end should be now.");
+
+test(function() {
+ performance.clearMarks();
+ performance.clearMeasures();
+ const markEntry = performance.mark("mark", {startTime: 123});
+ const measureEntry = performance.measure("A", "mark", "mark");
+ assert_equals(endTime(measureEntry), markEntry.startTime);
+ assert_equals(measureEntry.startTime, markEntry.startTime);
+}, "When start and end mark are both given, the start time and end time of the measure entry should be the the marks' time, repectively");
diff --git a/tests/wpt/web-platform-tests/user-timing/measure-l3.html b/tests/wpt/web-platform-tests/user-timing/measure-l3.html
deleted file mode 100644
index 0e8dacfef2b..00000000000
--- a/tests/wpt/web-platform-tests/user-timing/measure-l3.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-UserTiming L3: Measure basic usage
-
-
-
diff --git a/tests/wpt/web-platform-tests/user-timing/measure-with-dict.html b/tests/wpt/web-platform-tests/user-timing/measure-with-dict.any.js
similarity index 91%
rename from tests/wpt/web-platform-tests/user-timing/measure-with-dict.html
rename to tests/wpt/web-platform-tests/user-timing/measure-with-dict.any.js
index 8ba7b9fe67a..99a2fe4d798 100644
--- a/tests/wpt/web-platform-tests/user-timing/measure-with-dict.html
+++ b/tests/wpt/web-platform-tests/user-timing/measure-with-dict.any.js
@@ -1,16 +1,11 @@
-
-
-User Timing L3: measure is customizable
-
-
-
-
+}, "measure should throw a TypeError when passed an invalid argument combination");
+
diff --git a/tests/wpt/web-platform-tests/user-timing/structured-serialize-detail.any.js b/tests/wpt/web-platform-tests/user-timing/structured-serialize-detail.any.js
new file mode 100644
index 00000000000..55cbd9246f9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/user-timing/structured-serialize-detail.any.js
@@ -0,0 +1,64 @@
+test(function() {
+ performance.clearMarks();
+ const detail = { randomInfo: 123 }
+ const markEntry = new PerformanceMark("A", { detail });
+ assert_equals(markEntry.detail.randomInfo, detail.randomInfo);
+ assert_not_equals(markEntry.detail, detail);
+}, "The detail property in the mark constructor should be structured-clone.");
+
+test(function() {
+ performance.clearMarks();
+ const detail = { randomInfo: 123 }
+ const markEntry = performance.mark("A", { detail });
+ assert_not_equals(markEntry.detail, detail);
+}, "The detail property in the mark method should be structured-clone.");
+
+test(function() {
+ performance.clearMarks();
+ const markEntry = performance.mark("A");
+ assert_equals(markEntry.detail, null);
+}, "When accessing detail from a mark entry and the detail is not provided, just return a null value.");
+
+test(function() {
+ performance.clearMarks();
+ const detail = { unserializable: Symbol() };
+ assert_throws("DataCloneError", ()=>{
+ new PerformanceMark("A", { detail });
+ }, "Trying to structured-serialize a Symbol.");
+}, "Mark: Throw an exception when the detail property cannot be structured-serialized.");
+
+test(function() {
+ performance.clearMeasures();
+ const detail = { randomInfo: 123 }
+ const measureEntry = performance.measure("A", { detail });
+ assert_not_equals(measureEntry.detail, detail);
+}, "The detail property in the measure method should be structured-clone.");
+
+test(function() {
+ performance.clearMeasures();
+ const detail = { randomInfo: 123 }
+ const measureEntry = performance.measure("A", { detail });
+ assert_equals(measureEntry.detail, measureEntry.detail);
+}, "The detail property in the measure method should be the same reference.");
+
+test(function() {
+ performance.clearMeasures();
+ const measureEntry = performance.measure("A");
+ assert_equals(measureEntry.detail, null);
+}, "When accessing detail from a measure entry and the detail is not provided, just return a null value.");
+
+test(function() {
+ performance.clearMeasures();
+ const detail = { unserializable: Symbol() };
+ assert_throws("DataCloneError", ()=>{
+ performance.measure("A", { detail });
+ }, "Trying to structured-serialize a Symbol.");
+}, "Measure: Throw an exception when the detail property cannot be structured-serialized.");
+
+test(function() {
+ const bar = { 1: 2 };
+ const detail = { foo: 1, bar };
+ const mark = performance.mark("m", { detail });
+ detail.foo = 2;
+ assert_equals(mark.detail.foo, 1);
+}, "The detail object is cloned when passed to mark API.");
diff --git a/tests/wpt/web-platform-tests/user-timing/structured-serialize-detail.html b/tests/wpt/web-platform-tests/user-timing/structured-serialize-detail.html
deleted file mode 100644
index c9689fe3348..00000000000
--- a/tests/wpt/web-platform-tests/user-timing/structured-serialize-detail.html
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-UserTiming L3: the detail property should be serialized-cloned.
-
-
-
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-onicecandidateerror.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-onicecandidateerror.html
new file mode 100644
index 00000000000..e06c219483e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-onicecandidateerror.html
@@ -0,0 +1,31 @@
+
+
+RTCPeerConnection.prototype.onicecandidateerror
+
+
+
+
+
+
+ )
+
diff --git a/tests/wpt/web-platform-tests/loading/lazyload/image-loading-lazy.tentative.html b/tests/wpt/web-platform-tests/loading/lazyload/image-loading-lazy.tentative.html
new file mode 100644
index 00000000000..5920eb1882d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/loading/lazyload/image-loading-lazy.tentative.html
@@ -0,0 +1,50 @@
+
+
+ 
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/loading/lazyload/resources/image.png b/tests/wpt/web-platform-tests/loading/lazyload/resources/image.png
new file mode 100644
index 00000000000..b7128250938
Binary files /dev/null and b/tests/wpt/web-platform-tests/loading/lazyload/resources/image.png differ
diff --git a/tests/wpt/web-platform-tests/loading/lazyload/resources/subframe.html b/tests/wpt/web-platform-tests/loading/lazyload/resources/subframe.html
new file mode 100644
index 00000000000..07cb999afae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/loading/lazyload/resources/subframe.html
@@ -0,0 +1,4 @@
+
+
+