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

Side by Side Diff: Source/modules/serviceworkers/ServiceWorker.cpp

Issue 310423002: Remove the remaining ScriptState::current etc (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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
OLDNEW
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
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
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
OLDNEW
« no previous file with comments | « Source/bindings/v8/custom/V8WorkerGlobalScopeCustom.cpp ('k') | Source/web/tests/CustomEventTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698