Skip to content

GitLab

T
tangled
Commit 38f4426e authored by miguelg@chromium.org's avatar miguelg@chromium.org
Browse files
Options

Rename hasPermission to permissionState. 

As per https://github.com/w3c/push-api/issues/136
BUG=479246

Review URL: https://codereview.chromium.org/1083193006

git-svn-id: svn://svn.chromium.org/blink/trunk@194410 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 6097f44e
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 32 deletions
third_party/WebKit/LayoutTests/http/tests/push_messaging/interfaces.html
View file @ 38f4426e
......@@ -19,7 +19,7 @@
assert_own_property(PushManager.prototype, 'subscribe');
assert_own_property(PushManager.prototype, 'getSubscription');
assert_own_property(PushManager.prototype, 'hasPermission');
assert_own_property(PushManager.prototype, 'permissionState');
}, 'PushManager should be exposed and have the expected interface in a Document.');
......
third_party/WebKit/LayoutTests/http/tests/push_messaging/has-permission-default-in-document.html → third_party/WebKit/LayoutTests/http/tests/push_messaging/permission-state-default-in-document.html
View file @ 38f4426e
<!DOCTYPE html>
<html>
<head>
<title>Push API: hasPermission resolves with default when no permission is set</title>
<title>Push API: permissionState resolves with default when no permission is set</title>
<link rel="manifest" href="resources/push_manifest.json">
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
......@@ -18,14 +18,14 @@ async_test(function(test) {
service_worker_unregister_and_register(test, workerUrl, workerScope)
.then(function(serviceWorkerRegistration) {
// If running manually, clear permissions before running this test.
return serviceWorkerRegistration.pushManager.hasPermission();
return serviceWorkerRegistration.pushManager.permissionState();
})
.then(function(permissionStatus) {
assert_equals(permissionStatus, 'default');
return service_worker_unregister_and_done(test, workerScope);
})
.catch(unreached_rejection(test));
}, 'Push API: hasPermission resolves with default when permission is not set');
}, 'Push API: permissionState() resolves with default when permission is not set');
</script>
</body>
</html>
third_party/WebKit/LayoutTests/http/tests/push_messaging/has-permission-default-in-service-worker.html → third_party/WebKit/LayoutTests/http/tests/push_messaging/permission-state-default-in-service-worker.html
View file @ 38f4426e
......@@ -2,7 +2,7 @@
<html>
<head>
<title>
hasPermission when called in service worker resolves with default when no permission is set
Push API: permissionState when called in service worker resolves with default when no permission is set
</title>
<link rel="manifest" href="resources/push_manifest.json">
<script src="../resources/testharness.js"></script>
......@@ -21,21 +21,21 @@ async_test(function(test) {
var scope = 'resources/scope/' + location.pathname;
getActiveServiceWorkerWithMessagePort(test, script, scope).then(function(workerInfo) {
workerInfo.port.postMessage({command: 'hasPermission'});
workerInfo.port.postMessage({command: 'permissionState'});
workerInfo.port.addEventListener('message', function(event) {
if (typeof event.data != 'object' || !event.data.command)
assert_unreached('Invalid message from the service worker');
assert_equals(event.data.command, 'hasPermission');
assert_equals(event.data.command, 'permissionState');
assert_true(event.data.success,
'hasPermission should succeed. Error message: ' + event.data.errorMessage);
'permissionState should succeed. Error message: ' + event.data.errorMessage);
assert_equals(event.data.permission, 'default');
test.done();
});
}).catch(unreached_rejection(test));
}, 'hasPermission when called in service worker resolves with default when no permission is set');
}, 'permissionState when called in service worker resolves with default when no permission is set');
</script>
</body>
</html>
third_party/WebKit/LayoutTests/http/tests/push_messaging/has-permission-denied-in-document.html → third_party/WebKit/LayoutTests/http/tests/push_messaging/permission-state-denied-in-document.html
View file @ 38f4426e
<!DOCTYPE html>
<html>
<head>
<title>Push API: hasPermission resolves with denied when permission is denied</title>
<title>Push API: permissionState resolves with denied when permission is denied</title>
<link rel="manifest" href="resources/push_manifest.json">
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
......@@ -17,14 +17,14 @@ async_test(function(test) {
// If running manually, deny permission when prompted.
if (window.testRunner)
testRunner.setPermission('push-messaging', 'denied', location.origin, location.origin);
return serviceWorkerRegistration.pushManager.hasPermission();
return serviceWorkerRegistration.pushManager.permissionState();
})
.then(function(permissionStatus) {
assert_equals(permissionStatus, 'denied');
return service_worker_unregister_and_done(test, workerScope);
})
.catch(unreached_rejection(test));
}, 'Push API: hasPermission resolves with denied when permission is denied');
}, 'Push API: permissionState resolves with denied when permission is denied');
</script>
</body>
</html>
third_party/WebKit/LayoutTests/http/tests/push_messaging/has-permission-denied-in-service-worker.html → third_party/WebKit/LayoutTests/http/tests/push_messaging/permission-state-denied-in-service-worker.html
View file @ 38f4426e
......@@ -2,7 +2,7 @@
<html>
<head>
<title>
hasPermission when called in service worker resolves with denied when permission is denied
Push API: permissionState when called in service worker resolves with denied when permission is denied
</title>
<link rel="manifest" href="resources/push_manifest.json">
<script src="../resources/testharness.js"></script>
......@@ -21,21 +21,21 @@ async_test(function(test) {
var scope = 'resources/scope/' + location.pathname;
getActiveServiceWorkerWithMessagePort(test, script, scope).then(function(workerInfo) {
workerInfo.port.postMessage({command: 'hasPermission'});
workerInfo.port.postMessage({command: 'permissionState'});
workerInfo.port.addEventListener('message', function(event) {
if (typeof event.data != 'object' || !event.data.command)
assert_unreached('Invalid message from the service worker');
assert_equals(event.data.command, 'hasPermission');
assert_equals(event.data.command, 'permissionState');
assert_true(event.data.success,
'hasPermission should succeed. Error message: ' + event.data.errorMessage);
'permissionState should succeed. Error message: ' + event.data.errorMessage);
assert_equals(event.data.permission, 'denied');
test.done();
});
}).catch(unreached_rejection(test));
}, 'hasPermission when called in service worker resolves with denied when permission is denied');
}, 'permissionState when called in service worker resolves with denied when permission is denied');
</script>
</body>
</html>
third_party/WebKit/LayoutTests/http/tests/push_messaging/has-permission-granted-in-document.html → third_party/WebKit/LayoutTests/http/tests/push_messaging/permission-state-granted-in-document.html
View file @ 38f4426e
<!DOCTYPE html>
<html>
<head>
<title>Push API: hasPermission resolves with granted when permission is granted</title>
<title>Push API: permissionState resolves with granted when permission is granted</title>
<link rel="manifest" href="resources/push_manifest.json">
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
......@@ -17,14 +17,14 @@ async_test(function(test) {
// If running manually, grant permission when prompted.
if (window.testRunner)
testRunner.setPermission('push-messaging', 'granted', location.origin, location.origin);
return serviceWorkerRegistration.pushManager.hasPermission();
return serviceWorkerRegistration.pushManager.permissionState();
})
.then(function(permissionStatus) {
assert_equals(permissionStatus, 'granted');
return service_worker_unregister_and_done(test, workerScope);
})
.catch(unreached_rejection(test));
}, 'Push API: hasPermission resolves with granted when permission is granted');
}, 'Push API: permissionState resolves with granted when permission is granted');
</script>
</body>
</html>
third_party/WebKit/LayoutTests/http/tests/push_messaging/has-permission-granted-in-service-worker.html → third_party/WebKit/LayoutTests/http/tests/push_messaging/permission-state-granted-in-service-worker.html
View file @ 38f4426e
......@@ -2,7 +2,7 @@
<html>
<head>
<title>
hasPermission when called in service worker resolves with granted when permission is granted
permissionState when called in service worker resolves with granted when permission is granted
</title>
<link rel="manifest" href="resources/push_manifest.json">
<script src="../resources/testharness.js"></script>
......@@ -21,21 +21,21 @@ async_test(function(test) {
var scope = 'resources/scope/' + location.pathname;
getActiveServiceWorkerWithMessagePort(test, script, scope).then(function(workerInfo) {
workerInfo.port.postMessage({command: 'hasPermission'});
workerInfo.port.postMessage({command: 'permissionState'});
workerInfo.port.addEventListener('message', function(event) {
if (typeof event.data != 'object' || !event.data.command)
assert_unreached('Invalid message from the service worker');
assert_equals(event.data.command, 'hasPermission');
assert_equals(event.data.command, 'permissionState');
assert_true(event.data.success,
'hasPermission should succeed. Error message: ' + event.data.errorMessage);
'permissionState should succeed. Error message: ' + event.data.errorMessage);
assert_equals(event.data.permission, 'granted');
test.done();
});
}).catch(unreached_rejection(test));
}, 'hasPermission when called in service worker resolves with granted when permission is granted');
}, 'permissionState when called in service worker resolves with granted when permission is granted');
</script>
</body>
</html>
third_party/WebKit/LayoutTests/http/tests/push_messaging/resources/instrumentation-service-worker.js
View file @ 38f4426e
......@@ -15,8 +15,8 @@ self.addEventListener('message', function(workerEvent) {
return;
switch (event.data.command) {
case 'hasPermission':
self.registration.pushManager.hasPermission().then(function(permissionStatus) {
case 'permissionState':
self.registration.pushManager.permissionState().then(function(permissionStatus) {
port.postMessage({ command: event.data.command,
success: true,
permission: permissionStatus });
......
third_party/WebKit/LayoutTests/http/tests/push_messaging/resources/interfaces-worker.js
View file @ 38f4426e
......@@ -19,7 +19,7 @@ test(function() {
assert_inherits(registration.pushManager, 'subscribe');
assert_inherits(registration.pushManager, 'getSubscription');
assert_inherits(registration.pushManager, 'hasPermission');
assert_inherits(registration.pushManager, 'permissionState');
}, 'PushManager should be exposed and have the expected interface.');
......
third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt
View file @ 38f4426e
......@@ -3693,6 +3693,7 @@ interface PushManager
method constructor
method getSubscription
method hasPermission
method permissionState
method subscribe
interface PushSubscription
getter endpoint
......
third_party/WebKit/Source/modules/push_messaging/PushManager.cpp
View file @ 38f4426e
......@@ -75,7 +75,7 @@ ScriptPromise PushManager::getSubscription(ScriptState* scriptState)
return promise;
}
ScriptPromise PushManager::hasPermission(ScriptState* scriptState)
ScriptPromise PushManager::permissionState(ScriptState* scriptState)
{
if (scriptState->executionContext()->isDocument()) {
Document* document = toDocument(scriptState->executionContext());
......@@ -90,6 +90,11 @@ ScriptPromise PushManager::hasPermission(ScriptState* scriptState)
return promise;
}
ScriptPromise PushManager::hasPermission(ScriptState* scriptState)
{
return permissionState(scriptState);
}
DEFINE_TRACE(PushManager)
{
visitor->trace(m_registration);
......
third_party/WebKit/Source/modules/push_messaging/PushManager.h
View file @ 38f4426e
......@@ -24,6 +24,7 @@ public:
ScriptPromise subscribe(ScriptState*);
ScriptPromise getSubscription(ScriptState*);
ScriptPromise permissionState(ScriptState*);
ScriptPromise hasPermission(ScriptState*);
DECLARE_TRACE();
......
third_party/WebKit/Source/modules/push_messaging/PushManager.idl
View file @ 38f4426e
......@@ -11,5 +11,8 @@
] interface PushManager {
[CallWith=ScriptState] Promise<PushSubscription> subscribe();
[CallWith=ScriptState] Promise<PushSubscription?> getSubscription();
[RuntimeEnabled=PushMessagingHasPermission,CallWith=ScriptState] Promise permissionState();
// temporarily enabled as well for three sided patch
[RuntimeEnabled=PushMessagingHasPermission,CallWith=ScriptState] Promise hasPermission();
};
third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in
View file @ 38f4426e
......@@ -121,8 +121,7 @@ PseudoClassesInMatchingCriteriaInAuthorShadowTrees status=test
PushMessaging status=stable
// Push messaging payloads are blocked on the Push API supporting encryption.
PushMessagingData status=test
// PushManager.hasPermission() is currently disabled, expecting Permissions API
// to fulfill the same role.
// PushManager.permissionState() is currently disabled.
PushMessagingHasPermission status=test
QuotaPromise status=experimental
ReducedReferrerGranularity
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment