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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "modules/permissions/PermissionStatus.h" 6 #include "modules/permissions/PermissionStatus.h"
7 7
8 #include "bindings/core/v8/ScriptPromiseResolver.h" 8 #include "bindings/core/v8/ScriptPromiseResolver.h"
9 #include "core/dom/Document.h" 9 #include "core/dom/Document.h"
10 #include "core/events/Event.h" 10 #include "core/events/Event.h"
11 #include "core/frame/FrameConsole.h"
12 #include "core/inspector/ConsoleMessage.h"
13 #include "core/workers/WorkerGlobalScope.h"
11 #include "modules/EventTargetModulesNames.h" 14 #include "modules/EventTargetModulesNames.h"
12 #include "modules/permissions/PermissionController.h" 15 #include "modules/permissions/PermissionController.h"
13 #include "public/platform/Platform.h" 16 #include "public/platform/Platform.h"
14 #include "public/platform/modules/permissions/WebPermissionClient.h" 17 #include "public/platform/modules/permissions/WebPermissionClient.h"
15 18
16 namespace blink { 19 namespace blink {
17 20
18 namespace { 21 namespace {
19 22
20 // TODO(mlamouri): move this to a common place. 23 // TODO(mlamouri): move this to a common place.
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 128
126 ASSERT(executionContext()); 129 ASSERT(executionContext());
127 130
128 m_listening = false; 131 m_listening = false;
129 WebPermissionClient* client = permissionClient(executionContext()); 132 WebPermissionClient* client = permissionClient(executionContext());
130 if (!client) 133 if (!client)
131 return; 134 return;
132 client->stopListening(this); 135 client->stopListening(this);
133 } 136 }
134 137
135 String PermissionStatus::status() const 138 String PermissionStatus::state() const
136 { 139 {
137 switch (m_status) { 140 switch (m_status) {
138 case WebPermissionStatusGranted: 141 case WebPermissionStatusGranted:
139 return "granted"; 142 return "granted";
140 case WebPermissionStatusDenied: 143 case WebPermissionStatusDenied:
141 return "denied"; 144 return "denied";
142 case WebPermissionStatusPrompt: 145 case WebPermissionStatusPrompt:
143 return "prompt"; 146 return "prompt";
144 } 147 }
145 148
146 ASSERT_NOT_REACHED(); 149 ASSERT_NOT_REACHED();
147 return "denied"; 150 return "denied";
148 } 151 }
149 152
153 String PermissionStatus::status() const
154 {
155 RefPtrWillBeRawPtr<ConsoleMessage> message = ConsoleMessage::create(JSMessag eSource, WarningMessageLevel, "PermissionStatus.status is deprecated. Permission Status.state should be used instead.");
156 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.
157 toWorkerGlobalScope(executionContext())->addConsoleMessage(message);
158 } else if (executionContext()->isDocument()) {
159 Document* document = toDocument(executionContext());
160 if (document->frame())
161 document->frame()->console().addMessage(message);
162 }
163
164 return state();
165 }
166
150 DEFINE_TRACE(PermissionStatus) 167 DEFINE_TRACE(PermissionStatus)
151 { 168 {
152 RefCountedGarbageCollectedEventTargetWithInlineData<PermissionStatus>::trace (visitor); 169 RefCountedGarbageCollectedEventTargetWithInlineData<PermissionStatus>::trace (visitor);
153 ActiveDOMObject::trace(visitor); 170 ActiveDOMObject::trace(visitor);
154 } 171 }
155 172
156 } // namespace blink 173 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698