Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(339)

Unified Diff: Source/modules/permissions/PermissionStatus.cpp

Issue 1194963002: Add PermissionStatus.state and deprecate PermissionStatus.status. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/permissions/PermissionStatus.cpp
diff --git a/Source/modules/permissions/PermissionStatus.cpp b/Source/modules/permissions/PermissionStatus.cpp
index 60d892e2eff1e6e81573472db716bbd209615528..54e266866c2a69c7e66ea078b59296fa93790830 100644
--- a/Source/modules/permissions/PermissionStatus.cpp
+++ b/Source/modules/permissions/PermissionStatus.cpp
@@ -8,6 +8,9 @@
#include "bindings/core/v8/ScriptPromiseResolver.h"
#include "core/dom/Document.h"
#include "core/events/Event.h"
+#include "core/frame/FrameConsole.h"
+#include "core/inspector/ConsoleMessage.h"
+#include "core/workers/WorkerGlobalScope.h"
#include "modules/EventTargetModulesNames.h"
#include "modules/permissions/PermissionController.h"
#include "public/platform/Platform.h"
@@ -132,7 +135,7 @@ void PermissionStatus::stopListening()
client->stopListening(this);
}
-String PermissionStatus::status() const
+String PermissionStatus::state() const
{
switch (m_status) {
case WebPermissionStatusGranted:
@@ -147,6 +150,20 @@ String PermissionStatus::status() const
return "denied";
}
+String PermissionStatus::status() const
+{
+ RefPtrWillBeRawPtr<ConsoleMessage> message = ConsoleMessage::create(JSMessageSource, WarningMessageLevel, "PermissionStatus.status is deprecated. PermissionStatus.state should be used instead.");
+ if (executionContext()->isWorkerGlobalScope()) {
whywhat 2015/06/22 10:42:46 This sounds like a good candidate for ExecutionCon
mlamouri (slow - plz ping) 2015/06/29 19:26:06 Will do.
+ toWorkerGlobalScope(executionContext())->addConsoleMessage(message);
+ } else if (executionContext()->isDocument()) {
+ Document* document = toDocument(executionContext());
+ if (document->frame())
+ document->frame()->console().addMessage(message);
+ }
+
+ return state();
+}
+
DEFINE_TRACE(PermissionStatus)
{
RefCountedGarbageCollectedEventTargetWithInlineData<PermissionStatus>::trace(visitor);

Powered by Google App Engine
This is Rietveld 408576698