| 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 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 | 238 |
| 239 OwnPtr<WorkerThreadStartupData> startupData = | 239 OwnPtr<WorkerThreadStartupData> startupData = |
| 240 WorkerThreadStartupData::create( | 240 WorkerThreadStartupData::create( |
| 241 m_mainScriptLoader->url(), | 241 m_mainScriptLoader->url(), |
| 242 m_workerStartData.userAgent, | 242 m_workerStartData.userAgent, |
| 243 m_mainScriptLoader->script(), | 243 m_mainScriptLoader->script(), |
| 244 startMode, | 244 startMode, |
| 245 // FIXME: fill appropriate CSP info and policy type. | 245 // FIXME: fill appropriate CSP info and policy type. |
| 246 String(), | 246 String(), |
| 247 ContentSecurityPolicy::Enforce, | 247 ContentSecurityPolicy::Enforce, |
| 248 workerClients.release()); | 248 workerClients.release(), |
| 249 WorkerSettings::create()); |
| 249 | 250 |
| 250 m_mainScriptLoader.clear(); | 251 m_mainScriptLoader.clear(); |
| 251 | 252 |
| 252 m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *toW
ebFrameImpl(m_mainFrame)->frame()->document(), *contextClient); | 253 m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *toW
ebFrameImpl(m_mainFrame)->frame()->document(), *contextClient); |
| 253 m_loaderProxy = LoaderProxy::create(*this); | 254 m_loaderProxy = LoaderProxy::create(*this); |
| 254 | 255 |
| 255 m_workerThread = ServiceWorkerThread::create(*m_loaderProxy, *m_workerGlobal
ScopeProxy, startupData.release()); | 256 m_workerThread = ServiceWorkerThread::create(*m_loaderProxy, *m_workerGlobal
ScopeProxy, startupData.release()); |
| 256 m_workerThread->start(); | 257 m_workerThread->start(); |
| 257 } | 258 } |
| 258 | 259 |
| 259 } // namespace blink | 260 } // namespace blink |
| OLD | NEW |