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 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 DenyCrossOriginRequests, | 200 DenyCrossOriginRequests, |
201 bind(&WebSharedWorkerImpl::didReceiveScriptLoaderResponse, this), | 201 bind(&WebSharedWorkerImpl::didReceiveScriptLoaderResponse, this), |
202 bind(&WebSharedWorkerImpl::onScriptLoaderFinished, this)); | 202 bind(&WebSharedWorkerImpl::onScriptLoaderFinished, this)); |
203 } | 203 } |
204 | 204 |
205 bool WebSharedWorkerImpl::isControlledByServiceWorker(WebDataSource& dataSource) | 205 bool WebSharedWorkerImpl::isControlledByServiceWorker(WebDataSource& dataSource) |
206 { | 206 { |
207 return m_networkProvider && m_networkProvider->isControlledByServiceWorker(d
ataSource); | 207 return m_networkProvider && m_networkProvider->isControlledByServiceWorker(d
ataSource); |
208 } | 208 } |
209 | 209 |
210 int64_t WebSharedWorkerImpl::serviceWorkerID(WebDataSource& dataSource) | 210 std::string WebSharedWorkerImpl::serviceWorkerID(WebDataSource& dataSource) |
211 { | 211 { |
212 if (!m_networkProvider) | 212 if (!m_networkProvider) |
213 return -1; | 213 return std::string(); |
214 return m_networkProvider->serviceWorkerID(dataSource); | 214 return m_networkProvider->serviceWorkerID(dataSource); |
215 } | 215 } |
216 | 216 |
217 void WebSharedWorkerImpl::sendProtocolMessage(int callId, const WebString& messa
ge, const WebString& state) | 217 void WebSharedWorkerImpl::sendProtocolMessage(int callId, const WebString& messa
ge, const WebString& state) |
218 { | 218 { |
219 m_client->sendDevToolsMessage(callId, message, state); | 219 m_client->sendDevToolsMessage(callId, message, state); |
220 } | 220 } |
221 | 221 |
222 void WebSharedWorkerImpl::resumeStartup() | 222 void WebSharedWorkerImpl::resumeStartup() |
223 { | 223 { |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
411 if (devtoolsAgent) | 411 if (devtoolsAgent) |
412 devtoolsAgent->dispatchOnInspectorBackend(message); | 412 devtoolsAgent->dispatchOnInspectorBackend(message); |
413 } | 413 } |
414 | 414 |
415 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client) | 415 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client) |
416 { | 416 { |
417 return new WebSharedWorkerImpl(client); | 417 return new WebSharedWorkerImpl(client); |
418 } | 418 } |
419 | 419 |
420 } // namespace blink | 420 } // namespace blink |
OLD | NEW |