Source/modules/quota/StorageQuota.cpp - Issue 783423003: Make ScriptPromiseResolver RefCountedWillBeRefCountedGarbageCollected.

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

Issue 783423003: Make ScriptPromiseResolver RefCountedWillBeRefCountedGarbageCollected. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years 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

« Source/modules/crypto/CryptoResultImpl.cpp ('K') | « Source/modules/push_messaging/PushRegistrationCallbacks.cpp ('k') | Source/modules/quota/StorageQuotaCallbacksImpl.h » ('j') | Source/modules/webmidi/MIDIAccessInitializer.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 Loading...
77 Vector<String> StorageQuota::supportedTypes() const	77 Vector<String> StorageQuota::supportedTypes() const

78 {	78 {

79 Vector<String> types;	79 Vector<String> types;

80 for (size_t i = 0; i < WTF_ARRAY_LENGTH(storageTypeMappings); ++i)	80 for (size_t i = 0; i < WTF_ARRAY_LENGTH(storageTypeMappings); ++i)

81 types.append(storageTypeMappings[i].name);	81 types.append(storageTypeMappings[i].name);

82 return types;	82 return types;

83 }	83 }

84	84

85 ScriptPromise StorageQuota::queryInfo(ScriptState* scriptState, String type)	85 ScriptPromise StorageQuota::queryInfo(ScriptState* scriptState, String type)

86 {	86 {

87 RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scrip tState);	87 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver:: create(scriptState);

88 ScriptPromise promise = resolver->promise();	88 ScriptPromise promise = resolver->promise();

89	89

90 SecurityOrigin* securityOrigin = scriptState->executionContext()->securityOr igin();	90 SecurityOrigin* securityOrigin = scriptState->executionContext()->securityOr igin();

91 if (securityOrigin->isUnique()) {	91 if (securityOrigin->isUnique()) {

92 resolver->reject(DOMError::create(NotSupportedError));	92 resolver->reject(DOMError::create(NotSupportedError));

93 return promise;	93 return promise;

94 }	94 }

95	95

96 KURL storagePartition = KURL(KURL(), securityOrigin->toString());	96 KURL storagePartition = KURL(KURL(), securityOrigin->toString());

97 StorageQuotaCallbacks* callbacks = StorageQuotaCallbacksImpl::create(resolve r);	97 StorageQuotaCallbacks* callbacks = StorageQuotaCallbacksImpl::create(resolve r);

98 Platform::current()->queryStorageUsageAndQuota(storagePartition, stringToSto rageQuotaType(type), callbacks);	98 Platform::current()->queryStorageUsageAndQuota(storagePartition, stringToSto rageQuotaType(type), callbacks);

99 return promise;	99 return promise;

100 }	100 }

101	101

102 ScriptPromise StorageQuota::requestPersistentQuota(ScriptState* scriptState, uns igned long long newQuota)	102 ScriptPromise StorageQuota::requestPersistentQuota(ScriptState* scriptState, uns igned long long newQuota)

103 {	103 {

104 StorageQuotaClient* client = StorageQuotaClient::from(scriptState->execution Context());	104 StorageQuotaClient* client = StorageQuotaClient::from(scriptState->execution Context());

105 if (!client) {	105 if (!client) {

106 RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(s criptState);	106 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolv er::create(scriptState);

107 ScriptPromise promise = resolver->promise();	107 ScriptPromise promise = resolver->promise();

108 resolver->reject(DOMError::create(NotSupportedError));	108 resolver->reject(DOMError::create(NotSupportedError));

109 return promise;	109 return promise;

110 }	110 }

111	111

112 return client->requestPersistentQuota(scriptState, newQuota);	112 return client->requestPersistentQuota(scriptState, newQuota);

113 }	113 }

114	114

115 } // namespace blink	115 } // namespace blink

OLD	NEW