OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 } | 155 } |
156 | 156 |
157 PassRefPtrWillBeRawPtr<ServiceWorker> ServiceWorker::from(ScriptPromiseResolver*
resolver, WebType* worker) | 157 PassRefPtrWillBeRawPtr<ServiceWorker> ServiceWorker::from(ScriptPromiseResolver*
resolver, WebType* worker) |
158 { | 158 { |
159 RefPtrWillBeRawPtr<ServiceWorker> serviceWorker = ServiceWorker::from(resolv
er->scriptState()->executionContext(), worker); | 159 RefPtrWillBeRawPtr<ServiceWorker> serviceWorker = ServiceWorker::from(resolv
er->scriptState()->executionContext(), worker); |
160 ScriptState::Scope scope(resolver->scriptState()); | 160 ScriptState::Scope scope(resolver->scriptState()); |
161 serviceWorker->waitOnPromise(resolver->promise()); | 161 serviceWorker->waitOnPromise(resolver->promise()); |
162 return serviceWorker; | 162 return serviceWorker; |
163 } | 163 } |
164 | 164 |
| 165 void ServiceWorker::dispose(WebType* worker) |
| 166 { |
| 167 if (worker && !worker->proxy()) |
| 168 delete worker; |
| 169 } |
| 170 |
165 void ServiceWorker::setProxyState(ProxyState state) | 171 void ServiceWorker::setProxyState(ProxyState state) |
166 { | 172 { |
167 if (m_proxyState == state) | 173 if (m_proxyState == state) |
168 return; | 174 return; |
169 switch (m_proxyState) { | 175 switch (m_proxyState) { |
170 case Initial: | 176 case Initial: |
171 ASSERT(state == RegisterPromisePending || state == ContextStopped); | 177 ASSERT(state == RegisterPromisePending || state == ContextStopped); |
172 break; | 178 break; |
173 case RegisterPromisePending: | 179 case RegisterPromisePending: |
174 ASSERT(state == Ready || state == ContextStopped); | 180 ASSERT(state == Ready || state == ContextStopped); |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
232 , WebServiceWorkerProxy(this) | 238 , WebServiceWorkerProxy(this) |
233 , m_outerWorker(worker) | 239 , m_outerWorker(worker) |
234 , m_proxyState(Initial) | 240 , m_proxyState(Initial) |
235 { | 241 { |
236 ScriptWrappable::init(this); | 242 ScriptWrappable::init(this); |
237 ASSERT(m_outerWorker); | 243 ASSERT(m_outerWorker); |
238 m_outerWorker->setProxy(this); | 244 m_outerWorker->setProxy(this); |
239 } | 245 } |
240 | 246 |
241 } // namespace blink | 247 } // namespace blink |
OLD | NEW |