Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. |
| 3 * Copyright (C) 2009 Google Inc. All Rights Reserved. | 3 * Copyright (C) 2009 Google Inc. All Rights Reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 28 #include "config.h" | 28 #include "config.h" |
| 29 | 29 |
| 30 #include "core/workers/WorkerMessagingProxy.h" | 30 #include "core/workers/WorkerMessagingProxy.h" |
| 31 | 31 |
| 32 #include "core/dom/CrossThreadTask.h" | 32 #include "core/dom/CrossThreadTask.h" |
| 33 #include "core/dom/Document.h" | 33 #include "core/dom/Document.h" |
| 34 #include "core/events/ErrorEvent.h" | 34 #include "core/events/ErrorEvent.h" |
| 35 #include "core/events/MessageEvent.h" | 35 #include "core/events/MessageEvent.h" |
| 36 #include "core/frame/ContentSecurityPolicy.h" | 36 #include "core/frame/ContentSecurityPolicy.h" |
| 37 #include "core/frame/DOMWindow.h" | 37 #include "core/frame/DOMWindow.h" |
| 38 #include "core/frame/Settings.h" | |
| 38 #include "core/inspector/InspectorInstrumentation.h" | 39 #include "core/inspector/InspectorInstrumentation.h" |
| 39 #include "core/inspector/ScriptCallStack.h" | 40 #include "core/inspector/ScriptCallStack.h" |
| 40 #include "core/inspector/WorkerDebuggerAgent.h" | 41 #include "core/inspector/WorkerDebuggerAgent.h" |
| 41 #include "core/inspector/WorkerInspectorController.h" | 42 #include "core/inspector/WorkerInspectorController.h" |
| 42 #include "core/loader/DocumentLoadTiming.h" | 43 #include "core/loader/DocumentLoadTiming.h" |
| 43 #include "core/loader/DocumentLoader.h" | 44 #include "core/loader/DocumentLoader.h" |
| 44 #include "core/page/PageGroup.h" | 45 #include "core/page/PageGroup.h" |
| 45 #include "core/workers/DedicatedWorkerGlobalScope.h" | 46 #include "core/workers/DedicatedWorkerGlobalScope.h" |
| 46 #include "core/workers/DedicatedWorkerThread.h" | 47 #include "core/workers/DedicatedWorkerThread.h" |
| 47 #include "core/workers/Worker.h" | 48 #include "core/workers/Worker.h" |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 104 ASSERT((m_executionContext->isDocument() && isMainThread()) | 105 ASSERT((m_executionContext->isDocument() && isMainThread()) |
| 105 || (m_executionContext->isWorkerGlobalScope() && toWorkerGlobalScope(m_e xecutionContext.get())->thread()->isCurrentThread())); | 106 || (m_executionContext->isWorkerGlobalScope() && toWorkerGlobalScope(m_e xecutionContext.get())->thread()->isCurrentThread())); |
| 106 } | 107 } |
| 107 | 108 |
| 108 void WorkerMessagingProxy::startWorkerGlobalScope(const KURL& scriptURL, const S tring& userAgent, const String& sourceCode, WorkerThreadStartMode startMode) | 109 void WorkerMessagingProxy::startWorkerGlobalScope(const KURL& scriptURL, const S tring& userAgent, const String& sourceCode, WorkerThreadStartMode startMode) |
| 109 { | 110 { |
| 110 // FIXME: This need to be revisited when we support nested worker one day | 111 // FIXME: This need to be revisited when we support nested worker one day |
| 111 ASSERT(m_executionContext->isDocument()); | 112 ASSERT(m_executionContext->isDocument()); |
| 112 Document* document = toDocument(m_executionContext.get()); | 113 Document* document = toDocument(m_executionContext.get()); |
| 113 | 114 |
| 114 OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::creat e(scriptURL, userAgent, sourceCode, startMode, document->contentSecurityPolicy() ->deprecatedHeader(), document->contentSecurityPolicy()->deprecatedHeaderType(), m_workerClients.release()); | 115 OwnPtr<WorkerSettings> settings = WorkerSettings::create(); |
| 116 if (document->settings()) | |
| 117 settings->setMemoryInfoEnabled(document->settings()->memoryInfoEnabled() ); | |
|
kinuko
2014/03/04 04:34:35
Could we have these settings-to-settings copy meth
Pan
2014/03/06 08:50:56
right, thanks! Done.
| |
| 118 OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::creat e(scriptURL, userAgent, sourceCode, startMode, document->contentSecurityPolicy() ->deprecatedHeader(), document->contentSecurityPolicy()->deprecatedHeaderType(), m_workerClients.release(), settings.release()); | |
| 115 double originTime = document->loader() ? document->loader()->timing()->refer enceMonotonicTime() : monotonicallyIncreasingTime(); | 119 double originTime = document->loader() ? document->loader()->timing()->refer enceMonotonicTime() : monotonicallyIncreasingTime(); |
| 116 | 120 |
| 117 RefPtr<DedicatedWorkerThread> thread = DedicatedWorkerThread::create(*this, *m_workerObjectProxy.get(), originTime, startupData.release()); | 121 RefPtr<DedicatedWorkerThread> thread = DedicatedWorkerThread::create(*this, *m_workerObjectProxy.get(), originTime, startupData.release()); |
| 118 workerThreadCreated(thread); | 122 workerThreadCreated(thread); |
| 119 thread->start(); | 123 thread->start(); |
| 120 InspectorInstrumentation::didStartWorkerGlobalScope(m_executionContext.get() , this, scriptURL); | 124 InspectorInstrumentation::didStartWorkerGlobalScope(m_executionContext.get() , this, scriptURL); |
| 121 } | 125 } |
| 122 | 126 |
| 123 void WorkerMessagingProxy::postMessageToWorkerObject(PassRefPtr<SerializedScript Value> message, PassOwnPtr<MessagePortChannelArray> channels) | 127 void WorkerMessagingProxy::postMessageToWorkerObject(PassRefPtr<SerializedScript Value> message, PassOwnPtr<MessagePortChannelArray> channels) |
| 124 { | 128 { |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 297 { | 301 { |
| 298 m_workerThreadHadPendingActivity = hasPendingActivity; | 302 m_workerThreadHadPendingActivity = hasPendingActivity; |
| 299 } | 303 } |
| 300 | 304 |
| 301 bool WorkerMessagingProxy::hasPendingActivity() const | 305 bool WorkerMessagingProxy::hasPendingActivity() const |
| 302 { | 306 { |
| 303 return (m_unconfirmedMessageCount || m_workerThreadHadPendingActivity) && !m _askedToTerminate; | 307 return (m_unconfirmedMessageCount || m_workerThreadHadPendingActivity) && !m _askedToTerminate; |
| 304 } | 308 } |
| 305 | 309 |
| 306 } // namespace WebCore | 310 } // namespace WebCore |
| OLD | NEW |