| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 // to have same origin as the worker so the loading checks work correctly. | 157 // to have same origin as the worker so the loading checks work correctly. |
| 158 CString content(""); | 158 CString content(""); |
| 159 RefPtr<SharedBuffer> buffer( | 159 RefPtr<SharedBuffer> buffer( |
| 160 SharedBuffer::create(content.data(), content.length())); | 160 SharedBuffer::create(content.data(), content.length())); |
| 161 m_mainFrame->frame()->loader().load( | 161 m_mainFrame->frame()->loader().load( |
| 162 FrameLoadRequest(0, ResourceRequest(m_url), | 162 FrameLoadRequest(0, ResourceRequest(m_url), |
| 163 SubstituteData(buffer, "text/html", "UTF-8", KURL()))); | 163 SubstituteData(buffer, "text/html", "UTF-8", KURL()))); |
| 164 } | 164 } |
| 165 | 165 |
| 166 void WebSharedWorkerImpl::willSendRequest(WebLocalFrame* frame, | 166 void WebSharedWorkerImpl::willSendRequest(WebLocalFrame* frame, |
| 167 WebURLRequest& request) { | 167 WebURLRequest& request, |
| 168 WebFrameLoadType loadType) { |
| 168 if (m_networkProvider) | 169 if (m_networkProvider) |
| 169 m_networkProvider->willSendRequest(frame->dataSource(), request); | 170 m_networkProvider->willSendRequest(frame->dataSource(), request); |
| 170 } | 171 } |
| 171 | 172 |
| 172 void WebSharedWorkerImpl::didFinishDocumentLoad(WebLocalFrame* frame) { | 173 void WebSharedWorkerImpl::didFinishDocumentLoad(WebLocalFrame* frame) { |
| 173 DCHECK(!m_loadingDocument); | 174 DCHECK(!m_loadingDocument); |
| 174 DCHECK(!m_mainScriptLoader); | 175 DCHECK(!m_mainScriptLoader); |
| 175 m_networkProvider = WTF::wrapUnique( | 176 m_networkProvider = WTF::wrapUnique( |
| 176 m_client->createServiceWorkerNetworkProvider(frame->dataSource())); | 177 m_client->createServiceWorkerNetworkProvider(frame->dataSource())); |
| 177 m_mainScriptLoader = WorkerScriptLoader::create(); | 178 m_mainScriptLoader = WorkerScriptLoader::create(); |
| (...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 459 if (devtoolsAgent) | 460 if (devtoolsAgent) |
| 460 devtoolsAgent->dispatchOnInspectorBackend(sessionId, callId, method, | 461 devtoolsAgent->dispatchOnInspectorBackend(sessionId, callId, method, |
| 461 message); | 462 message); |
| 462 } | 463 } |
| 463 | 464 |
| 464 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client) { | 465 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client) { |
| 465 return new WebSharedWorkerImpl(client); | 466 return new WebSharedWorkerImpl(client); |
| 466 } | 467 } |
| 467 | 468 |
| 468 } // namespace blink | 469 } // namespace blink |
| OLD | NEW |