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

Side by Side Diff: Source/modules/quota/StorageQuota.cpp

Issue 297513008: Decrease call sites of ScriptState::current() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/modules/quota/StorageQuota.h ('k') | Source/modules/quota/StorageQuota.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 } 77 }
78 78
79 Vector<String> StorageQuota::supportedTypes() const 79 Vector<String> StorageQuota::supportedTypes() const
80 { 80 {
81 Vector<String> types; 81 Vector<String> types;
82 for (size_t i = 0; i < WTF_ARRAY_LENGTH(storageTypeMappings); ++i) 82 for (size_t i = 0; i < WTF_ARRAY_LENGTH(storageTypeMappings); ++i)
83 types.append(storageTypeMappings[i].name); 83 types.append(storageTypeMappings[i].name);
84 return types; 84 return types;
85 } 85 }
86 86
87 ScriptPromise StorageQuota::queryInfo(ExecutionContext* executionContext, String type) 87 ScriptPromise StorageQuota::queryInfo(ScriptState* scriptState, String type)
88 { 88 {
89 ASSERT(executionContext); 89 RefPtr<ScriptPromiseResolverWithContext> resolver = ScriptPromiseResolverWit hContext::create(scriptState);
90
91 RefPtr<ScriptPromiseResolverWithContext> resolver = ScriptPromiseResolverWit hContext::create(ScriptState::current(toIsolate(executionContext)));
92 ScriptPromise promise = resolver->promise(); 90 ScriptPromise promise = resolver->promise();
93 91
94 SecurityOrigin* securityOrigin = executionContext->securityOrigin(); 92 SecurityOrigin* securityOrigin = scriptState->executionContext()->securityOr igin();
95 if (securityOrigin->isUnique()) { 93 if (securityOrigin->isUnique()) {
96 resolver->reject(DOMError::create(NotSupportedError)); 94 resolver->reject(DOMError::create(NotSupportedError));
97 return promise; 95 return promise;
98 } 96 }
99 97
100 KURL storagePartition = KURL(KURL(), securityOrigin->toString()); 98 KURL storagePartition = KURL(KURL(), securityOrigin->toString());
101 OwnPtr<StorageQuotaCallbacks> callbacks = StorageQuotaCallbacksImpl::create( resolver); 99 OwnPtr<StorageQuotaCallbacks> callbacks = StorageQuotaCallbacksImpl::create( resolver);
102 blink::Platform::current()->queryStorageUsageAndQuota(storagePartition, stri ngToStorageQuotaType(type), callbacks.release()); 100 blink::Platform::current()->queryStorageUsageAndQuota(storagePartition, stri ngToStorageQuotaType(type), callbacks.release());
103 return promise; 101 return promise;
104 } 102 }
105 103
106 ScriptPromise StorageQuota::requestPersistentQuota(ScriptState* scriptState, uns igned long long newQuota) 104 ScriptPromise StorageQuota::requestPersistentQuota(ScriptState* scriptState, uns igned long long newQuota)
107 { 105 {
108 StorageQuotaClient* client = StorageQuotaClient::from(scriptState->execution Context()); 106 StorageQuotaClient* client = StorageQuotaClient::from(scriptState->execution Context());
109 if (!client) { 107 if (!client) {
110 RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(s criptState); 108 RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(s criptState);
111 ScriptPromise promise = resolver->promise(); 109 ScriptPromise promise = resolver->promise();
112 resolver->reject(DOMError::create(NotSupportedError)); 110 resolver->reject(DOMError::create(NotSupportedError));
113 return promise; 111 return promise;
114 } 112 }
115 113
116 return client->requestPersistentQuota(scriptState->executionContext(), newQu ota); 114 return client->requestPersistentQuota(scriptState->executionContext(), newQu ota);
117 } 115 }
118 116
119 StorageQuota::~StorageQuota() 117 StorageQuota::~StorageQuota()
120 { 118 {
121 } 119 }
122 120
123 } // namespace WebCore 121 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/quota/StorageQuota.h ('k') | Source/modules/quota/StorageQuota.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698