OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "modules/quota/StorageManager.h" | 5 #include "modules/quota/StorageManager.h" |
6 | 6 |
7 #include "bindings/core/v8/ScriptPromiseResolver.h" | 7 #include "bindings/core/v8/ScriptPromiseResolver.h" |
8 #include "bindings/modules/v8/V8StorageEstimate.h" | 8 #include "bindings/modules/v8/V8StorageEstimate.h" |
9 #include "core/dom/DOMException.h" | 9 #include "core/dom/DOMException.h" |
10 #include "core/dom/Document.h" | 10 #include "core/dom/Document.h" |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 if (!m_permissionService && | 143 if (!m_permissionService && |
144 connectToPermissionService(executionContext, | 144 connectToPermissionService(executionContext, |
145 mojo::GetProxy(&m_permissionService))) | 145 mojo::GetProxy(&m_permissionService))) |
146 m_permissionService.set_connection_error_handler(convertToBaseCallback( | 146 m_permissionService.set_connection_error_handler(convertToBaseCallback( |
147 WTF::bind(&StorageManager::permissionServiceConnectionError, | 147 WTF::bind(&StorageManager::permissionServiceConnectionError, |
148 wrapWeakPersistent(this)))); | 148 wrapWeakPersistent(this)))); |
149 return m_permissionService.get(); | 149 return m_permissionService.get(); |
150 } | 150 } |
151 | 151 |
152 void StorageManager::permissionServiceConnectionError() { | 152 void StorageManager::permissionServiceConnectionError() { |
| 153 if (!Platform::current()) { |
| 154 // TODO(rockot): Clean this up once renderer shutdown sequence is fixed. |
| 155 return; |
| 156 } |
| 157 |
153 m_permissionService.reset(); | 158 m_permissionService.reset(); |
154 } | 159 } |
155 | 160 |
156 void StorageManager::permissionRequestComplete(ScriptPromiseResolver* resolver, | 161 void StorageManager::permissionRequestComplete(ScriptPromiseResolver* resolver, |
157 PermissionStatus status) { | 162 PermissionStatus status) { |
158 if (!resolver->getExecutionContext() || | 163 if (!resolver->getExecutionContext() || |
159 resolver->getExecutionContext()->activeDOMObjectsAreStopped()) | 164 resolver->getExecutionContext()->activeDOMObjectsAreStopped()) |
160 return; | 165 return; |
161 resolver->resolve(status == PermissionStatus::GRANTED); | 166 resolver->resolve(status == PermissionStatus::GRANTED); |
162 } | 167 } |
163 | 168 |
164 } // namespace blink | 169 } // namespace blink |
OLD | NEW |