| 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 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 304 } | 304 } |
| 305 | 305 |
| 306 void SharedWorkerScriptLoader::load(const KURL& url) | 306 void SharedWorkerScriptLoader::load(const KURL& url) |
| 307 { | 307 { |
| 308 // Stay alive (and keep the SharedWorker and JS wrapper alive) until the loa
d finishes. | 308 // Stay alive (and keep the SharedWorker and JS wrapper alive) until the loa
d finishes. |
| 309 this->ref(); | 309 this->ref(); |
| 310 m_worker->setPendingActivity(m_worker.get()); | 310 m_worker->setPendingActivity(m_worker.get()); |
| 311 | 311 |
| 312 // Mark this object as active for the duration of the load. | 312 // Mark this object as active for the duration of the load. |
| 313 m_scriptLoader = WorkerScriptLoader::create(); | 313 m_scriptLoader = WorkerScriptLoader::create(); |
| 314 #if PLATFORM(BLACKBERRY) | |
| 315 m_scriptLoader->setTargetType(ResourceRequest::TargetIsSharedWorker); | |
| 316 #endif | |
| 317 m_scriptLoader->loadAsynchronously(m_worker->scriptExecutionContext(), url,
DenyCrossOriginRequests, this); | 314 m_scriptLoader->loadAsynchronously(m_worker->scriptExecutionContext(), url,
DenyCrossOriginRequests, this); |
| 318 } | 315 } |
| 319 | 316 |
| 320 void SharedWorkerScriptLoader::didReceiveResponse(unsigned long identifier, cons
t ResourceResponse&) | 317 void SharedWorkerScriptLoader::didReceiveResponse(unsigned long identifier, cons
t ResourceResponse&) |
| 321 { | 318 { |
| 322 InspectorInstrumentation::didReceiveScriptResponse(m_worker->scriptExecution
Context(), identifier); | 319 InspectorInstrumentation::didReceiveScriptResponse(m_worker->scriptExecution
Context(), identifier); |
| 323 } | 320 } |
| 324 | 321 |
| 325 void SharedWorkerScriptLoader::notifyFinished() | 322 void SharedWorkerScriptLoader::notifyFinished() |
| 326 { | 323 { |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 { | 432 { |
| 436 } | 433 } |
| 437 | 434 |
| 438 DefaultSharedWorkerRepository::~DefaultSharedWorkerRepository() | 435 DefaultSharedWorkerRepository::~DefaultSharedWorkerRepository() |
| 439 { | 436 { |
| 440 } | 437 } |
| 441 | 438 |
| 442 } // namespace WebCore | 439 } // namespace WebCore |
| 443 | 440 |
| 444 #endif // ENABLE(SHARED_WORKERS) | 441 #endif // ENABLE(SHARED_WORKERS) |
| OLD | NEW |