| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 // Disentangle the port in preparation for sending it to the remote context. | 69 // Disentangle the port in preparation for sending it to the remote context. |
| 70 OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(por
ts, exceptionState); | 70 OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(por
ts, exceptionState); |
| 71 if (exceptionState.hadException()) | 71 if (exceptionState.hadException()) |
| 72 return; | 72 return; |
| 73 thread()->workerObjectProxy().postMessageToWorkerObject(message, channels.re
lease()); | 73 thread()->workerObjectProxy().postMessageToWorkerObject(message, channels.re
lease()); |
| 74 } | 74 } |
| 75 | 75 |
| 76 void DedicatedWorkerGlobalScope::importScripts(const Vector<String>& urls, Excep
tionState& exceptionState) | 76 void DedicatedWorkerGlobalScope::importScripts(const Vector<String>& urls, Excep
tionState& exceptionState) |
| 77 { | 77 { |
| 78 Base::importScripts(urls, exceptionState); | 78 Base::importScripts(urls, exceptionState); |
| 79 thread()->workerObjectProxy().reportPendingActivity(hasPendingActivity()); | 79 thread()->workerObjectProxy().reportPendingActivity(ContextLifecycleNotifier
::hasPendingActivity()); |
| 80 } | 80 } |
| 81 | 81 |
| 82 DedicatedWorkerThread* DedicatedWorkerGlobalScope::thread() const | 82 DedicatedWorkerThread* DedicatedWorkerGlobalScope::thread() const |
| 83 { | 83 { |
| 84 return static_cast<DedicatedWorkerThread*>(Base::thread()); | 84 return static_cast<DedicatedWorkerThread*>(Base::thread()); |
| 85 } | 85 } |
| 86 | 86 |
| 87 class UseCounterTask : public ExecutionContextTask { | 87 class UseCounterTask : public ExecutionContextTask { |
| 88 public: | 88 public: |
| 89 static PassOwnPtr<UseCounterTask> createCount(UseCounter::Feature feature) {
return adoptPtr(new UseCounterTask(feature, false)); } | 89 static PassOwnPtr<UseCounterTask> createCount(UseCounter::Feature feature) {
return adoptPtr(new UseCounterTask(feature, false)); } |
| (...skipping 28 matching lines...) Expand all Loading... |
| 118 { | 118 { |
| 119 thread()->workerObjectProxy().postTaskToMainExecutionContext(UseCounterTask:
:createDeprecation(feature)); | 119 thread()->workerObjectProxy().postTaskToMainExecutionContext(UseCounterTask:
:createDeprecation(feature)); |
| 120 } | 120 } |
| 121 | 121 |
| 122 DEFINE_TRACE(DedicatedWorkerGlobalScope) | 122 DEFINE_TRACE(DedicatedWorkerGlobalScope) |
| 123 { | 123 { |
| 124 WorkerGlobalScope::trace(visitor); | 124 WorkerGlobalScope::trace(visitor); |
| 125 } | 125 } |
| 126 | 126 |
| 127 } // namespace blink | 127 } // namespace blink |
| OLD | NEW |