| 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 ASSERT(existingServiceWorker->executionContext() == executionContext); | 146 ASSERT(existingServiceWorker->executionContext() == executionContext); |
| 147 return existingServiceWorker; | 147 return existingServiceWorker; |
| 148 } | 148 } |
| 149 | 149 |
| 150 return create(executionContext, adoptPtr(worker)); | 150 return create(executionContext, adoptPtr(worker)); |
| 151 } | 151 } |
| 152 | 152 |
| 153 PassRefPtr<ServiceWorker> ServiceWorker::from(ScriptPromiseResolverWithContext*
resolver, WebType* worker) | 153 PassRefPtr<ServiceWorker> ServiceWorker::from(ScriptPromiseResolverWithContext*
resolver, WebType* worker) |
| 154 { | 154 { |
| 155 RefPtr<ServiceWorker> serviceWorker = ServiceWorker::from(resolver->scriptSt
ate()->executionContext(), worker); | 155 RefPtr<ServiceWorker> serviceWorker = ServiceWorker::from(resolver->scriptSt
ate()->executionContext(), worker); |
| 156 | |
| 157 ScriptState::Scope scope(resolver->scriptState()); | 156 ScriptState::Scope scope(resolver->scriptState()); |
| 158 serviceWorker->waitOnPromise(resolver->promise()); | 157 serviceWorker->waitOnPromise(resolver->promise()); |
| 159 | |
| 160 return serviceWorker; | 158 return serviceWorker; |
| 161 } | 159 } |
| 162 | 160 |
| 163 void ServiceWorker::onPromiseResolved() | 161 void ServiceWorker::onPromiseResolved() |
| 164 { | 162 { |
| 165 ASSERT(m_isPromisePending); | 163 ASSERT(m_isPromisePending); |
| 166 m_isPromisePending = false; | 164 m_isPromisePending = false; |
| 167 m_outerWorker->proxyReadyChanged(); | 165 m_outerWorker->proxyReadyChanged(); |
| 168 } | 166 } |
| 169 | 167 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 187 , WebServiceWorkerProxy(this) | 185 , WebServiceWorkerProxy(this) |
| 188 , m_outerWorker(worker) | 186 , m_outerWorker(worker) |
| 189 , m_isPromisePending(false) | 187 , m_isPromisePending(false) |
| 190 { | 188 { |
| 191 ScriptWrappable::init(this); | 189 ScriptWrappable::init(this); |
| 192 ASSERT(m_outerWorker); | 190 ASSERT(m_outerWorker); |
| 193 m_outerWorker->setProxy(this); | 191 m_outerWorker->setProxy(this); |
| 194 } | 192 } |
| 195 | 193 |
| 196 } // namespace WebCore | 194 } // namespace WebCore |
| OLD | NEW |