Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset c5f2f0e827d0 (bug 1403027) for build bustage at dom/workers/WorkerPrivate.cpp(984): expression did not evaluate to a constant, at least on Windows. r=backout on a CLOSED TREE

Browse Source 
--HG--
extra : amend_source : e6eb5cbe9b6b41a929c8f811859efe6093eab3a2
This commit is contained in:
Sebastian Hengst 2017-10-21 00:31:07 +02:00
parent aa75559a2f
commit 6125e83b28
22 changed files with 53 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/locales/en-US/chrome/dom/dom.properties
View File

@ -341,4 +341,3 @@ ScriptSourceNotAllowed=<script> source URI is not allowed in this document: “%
InvalidKeyframePropertyValue=Keyframe property value “%1$S” is invalid according to the syntax for “%2$S”.
# LOCALIZATION NOTE: Do not translate "ReadableStream".
ReadableStreamReadingFailed=Failed to read data from the ReadableStream: “%S”.
UnsupportedEntryTypesIgnored=Ignoring unsupported entryTypes: %S.

36
dom/performance/PerformanceObserver.cpp
View File

@ -10,7 +10,6 @@
#include "mozilla/dom/PerformanceBinding.h"
#include "mozilla/dom/PerformanceEntryBinding.h"
#include "mozilla/dom/PerformanceObserverBinding.h"
#include "nsIScriptError.h"
#include "nsPIDOMWindow.h"
#include "nsQueryObject.h"
#include "nsString.h"
@ -145,9 +144,11 @@ static const char16_t *const sValidTypeNames[4] = {
};
void
PerformanceObserver::Observe(const PerformanceObserverInit& aOptions)
PerformanceObserver::Observe(const PerformanceObserverInit& aOptions,
ErrorResult& aRv)
{
if (aOptions.mEntryTypes.IsEmpty()) {
aRv.Throw(NS_ERROR_DOM_TYPE_ERR);
return;
}
@ -161,37 +162,8 @@ PerformanceObserver::Observe(const PerformanceObserverInit& aOptions)
}
}
nsAutoString invalidTypesJoined;
bool addComma = false;
for (const auto& type : aOptions.mEntryTypes) {
if (!validEntryTypes.Contains<nsString>(type)) {
if (addComma) {
invalidTypesJoined.AppendLiteral(", ");
}
addComma = true;
invalidTypesJoined.Append(type);
}
}
if (!invalidTypesJoined.IsEmpty()) {
if (!NS_IsMainThread()) {
nsTArray<nsString> params;
params.AppendElement(invalidTypesJoined);
WorkerPrivate::ReportErrorToConsole("UnsupportedEntryTypesIgnored",
params);
} else {
nsCOMPtr<nsPIDOMWindowInner> ownerWindow =
do_QueryInterface(mOwner);
nsIDocument* document = ownerWindow->GetExtantDoc();
const char16_t* params[] = { invalidTypesJoined.get() };
nsContentUtils::ReportToConsole(nsIScriptError::warningFlag,
NS_LITERAL_CSTRING("DOM"), document,
nsContentUtils::eDOM_PROPERTIES,
"UnsupportedEntryTypesIgnored", params, 1);
}
}
if (validEntryTypes.IsEmpty()) {
aRv.Throw(NS_ERROR_DOM_TYPE_ERR);
return;
}

3
dom/performance/PerformanceObserver.h
View File

@ -54,7 +54,8 @@ public:
nsISupports* GetParentObject() const { return mOwner; }
void Observe(const PerformanceObserverInit& aOptions);
void Observe(const PerformanceObserverInit& aOptions,
mozilla::ErrorResult& aRv);
void Disconnect();

89
dom/performance/tests/test_performance_observer.html
View File

@ -7,84 +7,11 @@
<head>
<meta charset=utf-8>
<title>Test for performance observer</title>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
</head>
<body>
<div id="log"></div>
<script>
SimpleTest.requestFlakyTimeout("For testing when observer callbacks should not be called.");
SimpleTest.waitForExplicitFinish();
let _tests = [];
let test = promise_test = fn => {
let cleanups = [];
_tests.push(async () => {
try {
await fn({
add_cleanup: f => { cleanups.push(f); },
step_timeout: function(f, timeout) {
var test_this = this;
var args = Array.prototype.slice.call(arguments, 2);
return setTimeout(() => {
return f.apply(test_this, args);
}, timeout);
}
});
} catch(e) {
ok(false, `got unexpected exception ${e}`);
}
try {
cleanups.forEach(fn, fn);
} catch(e) {
ok(false, `got unexpected exception during cleanup ${e}`);
}
runNextTest();
});
}
function runNextTest() {
if (_tests.length == 0) {
SimpleTest.finish()
return;
}
_tests.shift()();
}
function assert_equals(actual, expected, description) {
ok(typeof actual == typeof expected,
`${description} expected (${typeof expected}) ${expected} but got (${typeof actual}) ${actual}`);
ok(Object.is(actual, expected),
`${description} expected ${expected} but got ${actual}`);
}
function assert_array_equals(actual, expected, description) {
ok(actual.length === expected.length,
`${description} lengths differ, expected ${expected.length} but got ${actual.length}`);
for (var i = 0; i < actual.length; i++) {
ok(actual.hasOwnProperty(i) === expected.hasOwnProperty(i),
`${description} property expected to be ${expected[i]} but got ${actual[i]}`);
}
}
function assert_throws(expected_exc, func, desc) {
try {
func.call(this);
} catch(e) {
var actual = e.name || e.type;
var expected = expected_exc.name || expected_exc.type;
ok(actual == expected,
`Expected '${expected}', got '${actual}'.`);
return;
}
ok(false, "Expected exception, but none was thrown");
}
function assert_unreached(description) {
ok(false, `${description} reached unreachable code`);
}
</script>
<script src="test_performance_observer.js"></script>
<script>
function makeXHR(aUrl) {
@ -93,12 +20,6 @@ function makeXHR(aUrl) {
xmlhttp.send();
}
let waitForConsole = new Promise(resolve => {
SimpleTest.monitorConsole(resolve, [{
message: /JavaScript Warning: "Ignoring unsupported entryTypes: invalid."/,
}]);
});
promise_test(t => {
var promise = new Promise(resolve => {
performance.clearResourceTimings();
@ -110,7 +31,7 @@ promise_test(t => {
makeXHR("test-data.json");
return promise.then(async list => {
return promise.then(list => {
assert_equals(list.getEntries().length, 1);
assert_array_equals(list.getEntries(),
performance.getEntriesByType("resource"),
@ -129,12 +50,8 @@ promise_test(t => {
assert_array_equals(list.getEntries({initiatorType: "link"}),
[],
"getEntries with non-existent initiatorType filter should return an empty array.");
SimpleTest.endMonitorConsole();
await waitForConsole;
});
}, "resource-timing test");
runNextTest();
</script>
</body>

10
dom/performance/tests/test_performance_observer.js
View File

@ -20,15 +20,17 @@ test(t => {
observer.observe({ unsupportedAttribute: "unsupported" });
}, "obsrve() should throw TypeError exception if the option has no 'entryTypes' attribute.");
assert_equals(undefined, observer.observe({ entryTypes: [] }),
"observe() should silently ignore empty 'entryTypes' sequence.");
assert_throws({name: "TypeError"}, function() {
observer.observe({ entryTypes: [] });
}, "obsrve() should throw TypeError exception if 'entryTypes' attribute is an empty sequence.");
assert_throws({name: "TypeError"}, function() {
observer.observe({ entryTypes: null });
}, "obsrve() should throw TypeError exception if 'entryTypes' attribute is null.");
assert_equals(undefined, observer.observe({ entryTypes: ["invalid"] }),
"observe() should silently ignore invalid 'entryTypes' values.");
assert_throws({name: "TypeError"}, function() {
observer.observe({ entryTypes: ["invalid"]});
}, "obsrve() should throw TypeError exception if 'entryTypes' attribute value is invalid.");
}, "Test that PerformanceObserver.observe throws exception");
function promiseObserve(test, options) {

14
dom/performance/tests/test_worker_observer.html
View File

@ -9,24 +9,10 @@
<title>Test for performance observer in worker</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
</head>
<body>
<div id="log"></div>
<script>
SimpleTest.waitForExplicitFinish();
let waitForConsole = new Promise(resolve => {
SimpleTest.monitorConsole(resolve, [{
message: /JavaScript Warning: "Ignoring unsupported entryTypes: invalid."/,
}]);
});
add_completion_callback(async () => {
SimpleTest.endMonitorConsole();
await waitForConsole;
});
fetch_tests_from_worker(new Worker("worker_performance_observer.js"));
</script>
</body>

1
dom/webidl/PerformanceObserver.webidl
View File

@ -18,6 +18,7 @@ callback PerformanceObserverCallback = void (PerformanceObserverEntryList entrie
Constructor(PerformanceObserverCallback callback),
Exposed=(Window,Worker)]
interface PerformanceObserver {
[Throws]
void observe(PerformanceObserverInit options);
void disconnect();
};

37
dom/workers/WorkerPrivate.cpp
View File

@ -958,13 +958,11 @@ private:
class ReportErrorToConsoleRunnable final : public WorkerRunnable
{
const char* mMessage;
const nsTArray<nsString> mParams;
public:
// aWorkerPrivate is the worker thread we're on (or the main thread, if null)
static void
Report(WorkerPrivate* aWorkerPrivate, const char* aMessage,
const nsTArray<nsString>& aParams)
Report(WorkerPrivate* aWorkerPrivate, const char* aMessage)
{
if (aWorkerPrivate) {
aWorkerPrivate->AssertIsOnWorkerThread();
@ -975,29 +973,23 @@ public:
// Now fire a runnable to do the same on the parent's thread if we can.
if (aWorkerPrivate) {
RefPtr<ReportErrorToConsoleRunnable> runnable =
new ReportErrorToConsoleRunnable(aWorkerPrivate, aMessage, aParams);
new ReportErrorToConsoleRunnable(aWorkerPrivate, aMessage);
runnable->Dispatch();
return;
}
uint16_t paramCount = aParams.Length();
const char16_t* params[paramCount];
for (uint16_t i=0; i<paramCount; ++i) {
params[i] = aParams[i].get();
}
// Log a warning to the console.
nsContentUtils::ReportToConsole(nsIScriptError::warningFlag,
NS_LITERAL_CSTRING("DOM"), nullptr,
nsContentUtils::eDOM_PROPERTIES, aMessage,
paramCount ? params : nullptr, paramCount);
NS_LITERAL_CSTRING("DOM"),
nullptr,
nsContentUtils::eDOM_PROPERTIES,
aMessage);
}
private:
ReportErrorToConsoleRunnable(WorkerPrivate* aWorkerPrivate, const char* aMessage,
const nsTArray<nsString>& aParams)
ReportErrorToConsoleRunnable(WorkerPrivate* aWorkerPrivate, const char* aMessage)
: WorkerRunnable(aWorkerPrivate, ParentThreadUnchangedBusyCount),
mMessage(aMessage), mParams(aParams)
mMessage(aMessage)
{ }
virtual void
@ -1014,7 +1006,7 @@ private:
{
WorkerPrivate* parent = aWorkerPrivate->GetParent();
MOZ_ASSERT_IF(!parent, NS_IsMainThread());
Report(parent, mMessage, mParams);
Report(parent, mMessage);
return true;
}
};
@ -6431,22 +6423,13 @@ WorkerPrivate::ReportError(JSContext* aCx, JS::ConstUTF8CharsZ aToStringResult,
// static
void
WorkerPrivate::ReportErrorToConsole(const char* aMessage)
{
nsTArray<nsString> emptyParams;
WorkerPrivate::ReportErrorToConsole(aMessage, emptyParams);
}
// static
void
WorkerPrivate::ReportErrorToConsole(const char* aMessage,
const nsTArray<nsString>& aParams)
{
WorkerPrivate* wp = nullptr;
if (!NS_IsMainThread()) {
wp = GetCurrentThreadWorkerPrivate();
}
ReportErrorToConsoleRunnable::Report(wp, aMessage, aParams);
ReportErrorToConsoleRunnable::Report(wp, aMessage);
}
int32_t

3
dom/workers/WorkerPrivate.h
View File

@ -1229,9 +1229,6 @@ public:
static void
ReportErrorToConsole(const char* aMessage);
static void
ReportErrorToConsole(const char* aMessage, const nsTArray<nsString>& aParams);
int32_t
SetTimeout(JSContext* aCx, nsIScriptTimeoutHandler* aHandler,
int32_t aTimeout, bool aIsInterval,

5
testing/web-platform/meta/longtask-timing/longtask-attributes.html.ini
View File

@ -1,9 +1,8 @@
[longtask-attributes.html]
type: testharness
expected: TIMEOUT
[Performance longtask entries are observable]
expected: TIMEOUT
expected: FAIL
[Performance longtask entries are observable.]
expected: TIMEOUT
expected: FAIL

5
testing/web-platform/meta/longtask-timing/longtask-in-childiframe-crossorigin.html.ini
View File

@ -1,9 +1,8 @@
[longtask-in-childiframe-crossorigin.html]
type: testharness
expected: TIMEOUT
[Performance longtask entries in child iframe are observable in parent]
expected: TIMEOUT
expected: FAIL
[Performance longtask entries in child iframe are observable in parent.]
expected: TIMEOUT
expected: FAIL

5
testing/web-platform/meta/longtask-timing/longtask-in-childiframe.html.ini
View File

@ -1,9 +1,8 @@
[longtask-in-childiframe.html]
type: testharness
expected: TIMEOUT
[Performance longtask entries in child iframe are observable in parent]
expected: TIMEOUT
expected: FAIL
[Performance longtask entries in child iframe are observable in parent.]
expected: TIMEOUT
expected: FAIL

5
testing/web-platform/meta/longtask-timing/longtask-in-externalscript.html.ini
View File

@ -1,9 +1,8 @@
[longtask-in-externalscript.html]
type: testharness
expected: TIMEOUT
[Performance longtask entries are observable]
expected: TIMEOUT
expected: FAIL
[Performance longtask entries are observable.]
expected: TIMEOUT
expected: FAIL

5
testing/web-platform/meta/longtask-timing/longtask-in-raf.html.ini
View File

@ -1,9 +1,8 @@
[longtask-in-raf.html]
type: testharness
expected: TIMEOUT
[Performance longtask entries are observable]
expected: TIMEOUT
expected: FAIL
[Performance longtask entries are observable.]
expected: TIMEOUT
expected: FAIL

3
testing/web-platform/meta/navigation-timing/nav2_test_attributes_exist.html.ini
View File

@ -1,6 +1,5 @@
[nav2_test_attributes_exist.html]
type: testharness
expected: TIMEOUT
[Performance navigation timing entries are observable.]
expected: TIMEOUT
expected: FAIL

3
testing/web-platform/meta/navigation-timing/nav2_test_attributes_values.html.ini
View File

@ -1,6 +1,5 @@
[nav2_test_attributes_values.html]
type: testharness
expected: TIMEOUT
[Performance navigation timing instance's value is reasonable.]
expected: TIMEOUT
expected: FAIL

3
testing/web-platform/meta/navigation-timing/nav2_test_instance_accessors.html.ini
View File

@ -1,6 +1,5 @@
[nav2_test_instance_accessors.html]
type: testharness
expected: TIMEOUT
[Performance navigation timing entries are accessible through three different accessors.]
expected: TIMEOUT
expected: FAIL

3
testing/web-platform/meta/navigation-timing/nav2_test_navigation_type_navigate.html.ini
View File

@ -1,6 +1,5 @@
[nav2_test_navigation_type_navigate.html]
type: testharness
expected: TIMEOUT
[Navigation type to be navigate.]
expected: TIMEOUT
expected: FAIL

3
testing/web-platform/meta/navigation-timing/nav2_test_redirect_none.html.ini
View File

@ -1,6 +1,5 @@
[nav2_test_redirect_none.html]
type: testharness
expected: TIMEOUT
[Naivation without redirects.]
expected: TIMEOUT
expected: FAIL

3
testing/web-platform/meta/navigation-timing/nav2_test_unique_nav_instances.html.ini
View File

@ -1,6 +1,5 @@
[nav2_test_unique_nav_instances.html]
type: testharness
expected: TIMEOUT
[Each window has a unique nav timing 2 instance.]
expected: TIMEOUT
expected: FAIL

3
testing/web-platform/meta/performance-timeline/po-navigation.html.ini
View File

@ -1,6 +1,5 @@
[po-navigation.html]
type: testharness
expected: TIMEOUT
[navigation entry is observable]
expected: TIMEOUT
expected: FAIL

22
testing/web-platform/tests/performance-timeline/po-observe.any.js
View File

@ -14,18 +14,16 @@
assert_throws(new TypeError(), function () {
obs.observe({entryTypes: "mark"});
});
}, "entryTypes must be a sequence or throw a TypeError");
test(function () {
var obs = new PerformanceObserver(function () { return true; });
obs.observe({entryTypes: []});
}, "Empty sequence entryTypes is a no-op");
test(function () {
var obs = new PerformanceObserver(function () { return true; });
obs.observe({entryTypes: ["this-cannot-match-an-entryType"]});
obs.observe({entryTypes: ["marks","navigate", "resources"]});
}, "Unknown entryTypes are no-op");
assert_throws(new TypeError(), function () {
obs.observe({entryTypes: []});
});
assert_throws(new TypeError(), function () {
obs.observe({entryTypes: ["this-cannot-match-an-entryType"]});
});
assert_throws(new TypeError(), function () {
obs.observe({entryTypes: ["marks","navigate", "resources"]});
});
}, "Empty sequence entryTypes throws a TypeError");
test(function () {
var obs = new PerformanceObserver(function () { return true; });