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

Side by Side Diff: Source/modules/permissions/Permissions.cpp

Issue 1300143002: permissions: fix small mistakes in error messages (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/Permissions.h" 6 #include "modules/permissions/Permissions.h"
7 7
8 #include "bindings/core/v8/Dictionary.h" 8 #include "bindings/core/v8/Dictionary.h"
9 #include "bindings/core/v8/ScriptPromise.h" 9 #include "bindings/core/v8/ScriptPromise.h"
10 #include "bindings/core/v8/ScriptPromiseResolver.h" 10 #include "bindings/core/v8/ScriptPromiseResolver.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 // permission prompt will be shown even if the returned permission will most 101 // permission prompt will be shown even if the returned permission will most
102 // likely be "prompt". 102 // likely be "prompt".
103 client->queryPermission(type, KURL(KURL(), scriptState->executionContext()-> securityOrigin()->toString()), new PermissionCallback(resolver, type)); 103 client->queryPermission(type, KURL(KURL(), scriptState->executionContext()-> securityOrigin()->toString()), new PermissionCallback(resolver, type));
104 return promise; 104 return promise;
105 } 105 }
106 106
107 ScriptPromise Permissions::request(ScriptState* scriptState, const Dictionary& r awPermission) 107 ScriptPromise Permissions::request(ScriptState* scriptState, const Dictionary& r awPermission)
108 { 108 {
109 WebPermissionClient* client = getClient(scriptState->executionContext()); 109 WebPermissionClient* client = getClient(scriptState->executionContext());
110 if (!client) 110 if (!client)
111 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(InvalidStateError, "In its current state, the global scope can't query pe rmissions.")); 111 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(InvalidStateError, "In its current state, the global scope can't request permissions."));
112 112
113 TrackExceptionState exceptionState; 113 TrackExceptionState exceptionState;
114 PermissionDescriptor permission = NativeValueTraits<PermissionDescriptor>::n ativeValue(scriptState->isolate(), rawPermission.v8Value(), exceptionState); 114 PermissionDescriptor permission = NativeValueTraits<PermissionDescriptor>::n ativeValue(scriptState->isolate(), rawPermission.v8Value(), exceptionState);
115 115
116 if (exceptionState.hadException()) 116 if (exceptionState.hadException())
117 return ScriptPromise::reject(scriptState, v8::Exception::TypeError(v8Str ing(scriptState->isolate(), exceptionState.message()))); 117 return ScriptPromise::reject(scriptState, v8::Exception::TypeError(v8Str ing(scriptState->isolate(), exceptionState.message())));
118 118
119 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ; 119 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
120 ScriptPromise promise = resolver->promise(); 120 ScriptPromise promise = resolver->promise();
121 121
122 WebPermissionType type = getPermissionType(scriptState, rawPermission, permi ssion, exceptionState); 122 WebPermissionType type = getPermissionType(scriptState, rawPermission, permi ssion, exceptionState);
123 if (handleNotSupportedPermission(scriptState, rawPermission, resolver, type, exceptionState)) 123 if (handleNotSupportedPermission(scriptState, rawPermission, resolver, type, exceptionState))
124 return promise; 124 return promise;
125 125
126 client->requestPermission(type, KURL(KURL(), scriptState->executionContext() ->securityOrigin()->toString()), new PermissionCallback(resolver, type)); 126 client->requestPermission(type, KURL(KURL(), scriptState->executionContext() ->securityOrigin()->toString()), new PermissionCallback(resolver, type));
127 return promise; 127 return promise;
128 } 128 }
129 129
130 ScriptPromise Permissions::request(ScriptState* scriptState, const Vector<Dictio nary>& rawPermissions) 130 ScriptPromise Permissions::request(ScriptState* scriptState, const Vector<Dictio nary>& rawPermissions)
131 { 131 {
132 WebPermissionClient* client = getClient(scriptState->executionContext()); 132 WebPermissionClient* client = getClient(scriptState->executionContext());
133 if (!client) 133 if (!client)
134 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(InvalidStateError, "In its current state, the global scope can't query pe rmissions.")); 134 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(InvalidStateError, "In its current state, the global scope can't request permissions."));
135 135
136 TrackExceptionState exceptionState; 136 TrackExceptionState exceptionState;
137 OwnPtr<WebVector<WebPermissionType>> permissions = adoptPtr(new WebVector<We bPermissionType>(rawPermissions.size())); 137 OwnPtr<WebVector<WebPermissionType>> permissions = adoptPtr(new WebVector<We bPermissionType>(rawPermissions.size()));
138 138
139 for (size_t i = 0; i < rawPermissions.size(); ++i) { 139 for (size_t i = 0; i < rawPermissions.size(); ++i) {
140 const Dictionary& rawPermission = rawPermissions[i]; 140 const Dictionary& rawPermission = rawPermissions[i];
141 PermissionDescriptor permission = NativeValueTraits<PermissionDescriptor >::nativeValue(scriptState->isolate(), rawPermission.v8Value(), exceptionState); 141 PermissionDescriptor permission = NativeValueTraits<PermissionDescriptor >::nativeValue(scriptState->isolate(), rawPermission.v8Value(), exceptionState);
142 142
143 if (exceptionState.hadException()) 143 if (exceptionState.hadException())
144 return ScriptPromise::reject(scriptState, v8::Exception::TypeError(v 8String(scriptState->isolate(), exceptionState.message()))); 144 return ScriptPromise::reject(scriptState, v8::Exception::TypeError(v 8String(scriptState->isolate(), exceptionState.message())));
(...skipping 11 matching lines...) Expand all
156 } 156 }
157 157
158 client->requestPermissions(*permissions, KURL(KURL(), scriptState->execution Context()->securityOrigin()->toString()), new PermissionsCallback(resolver, perm issions.release())); 158 client->requestPermissions(*permissions, KURL(KURL(), scriptState->execution Context()->securityOrigin()->toString()), new PermissionsCallback(resolver, perm issions.release()));
159 return promise; 159 return promise;
160 } 160 }
161 161
162 ScriptPromise Permissions::revoke(ScriptState* scriptState, const Dictionary& ra wPermission) 162 ScriptPromise Permissions::revoke(ScriptState* scriptState, const Dictionary& ra wPermission)
163 { 163 {
164 WebPermissionClient* client = getClient(scriptState->executionContext()); 164 WebPermissionClient* client = getClient(scriptState->executionContext());
165 if (!client) 165 if (!client)
166 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(InvalidStateError, "In its current state, the global scope can't query pe rmissions.")); 166 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(InvalidStateError, "In its current state, the global scope can't revoke p ermissions."));
167 167
168 TrackExceptionState exceptionState; 168 TrackExceptionState exceptionState;
169 PermissionDescriptor permission = NativeValueTraits<PermissionDescriptor>::n ativeValue(scriptState->isolate(), rawPermission.v8Value(), exceptionState); 169 PermissionDescriptor permission = NativeValueTraits<PermissionDescriptor>::n ativeValue(scriptState->isolate(), rawPermission.v8Value(), exceptionState);
170 170
171 if (exceptionState.hadException()) 171 if (exceptionState.hadException())
172 return ScriptPromise::reject(scriptState, v8::Exception::TypeError(v8Str ing(scriptState->isolate(), exceptionState.message()))); 172 return ScriptPromise::reject(scriptState, v8::Exception::TypeError(v8Str ing(scriptState->isolate(), exceptionState.message())));
173 173
174 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ; 174 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
175 ScriptPromise promise = resolver->promise(); 175 ScriptPromise promise = resolver->promise();
176 176
177 WebPermissionType type = getPermissionType(scriptState, rawPermission, permi ssion, exceptionState); 177 WebPermissionType type = getPermissionType(scriptState, rawPermission, permi ssion, exceptionState);
178 if (handleNotSupportedPermission(scriptState, rawPermission, resolver, type, exceptionState)) 178 if (handleNotSupportedPermission(scriptState, rawPermission, resolver, type, exceptionState))
179 return promise; 179 return promise;
180 180
181 client->revokePermission(type, KURL(KURL(), scriptState->executionContext()- >securityOrigin()->toString()), new PermissionCallback(resolver, type)); 181 client->revokePermission(type, KURL(KURL(), scriptState->executionContext()- >securityOrigin()->toString()), new PermissionCallback(resolver, type));
182 return promise; 182 return promise;
183 } 183 }
184 184
185 } // namespace blink 185 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698