| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 | 59 |
| 60 context->applyContentSecurityPolicyFromString(startupData->m_contentSecurity
Policy, startupData->m_contentSecurityPolicyType); | 60 context->applyContentSecurityPolicyFromString(startupData->m_contentSecurity
Policy, startupData->m_contentSecurityPolicyType); |
| 61 | 61 |
| 62 return context.release(); | 62 return context.release(); |
| 63 } | 63 } |
| 64 | 64 |
| 65 ServiceWorkerGlobalScope::ServiceWorkerGlobalScope(const KURL& url, const String
& userAgent, ServiceWorkerThread* thread, double timeOrigin, PassOwnPtrWillBeRaw
Ptr<WorkerClients> workerClients) | 65 ServiceWorkerGlobalScope::ServiceWorkerGlobalScope(const KURL& url, const String
& userAgent, ServiceWorkerThread* thread, double timeOrigin, PassOwnPtrWillBeRaw
Ptr<WorkerClients> workerClients) |
| 66 : WorkerGlobalScope(url, userAgent, thread, timeOrigin, workerClients) | 66 : WorkerGlobalScope(url, userAgent, thread, timeOrigin, workerClients) |
| 67 , m_fetchManager(adoptPtr(new FetchManager(this))) | 67 , m_fetchManager(adoptPtr(new FetchManager(this))) |
| 68 { | 68 { |
| 69 ScriptWrappable::init(this); | |
| 70 } | 69 } |
| 71 | 70 |
| 72 ServiceWorkerGlobalScope::~ServiceWorkerGlobalScope() | 71 ServiceWorkerGlobalScope::~ServiceWorkerGlobalScope() |
| 73 { | 72 { |
| 74 } | 73 } |
| 75 | 74 |
| 76 void ServiceWorkerGlobalScope::stopFetch() | 75 void ServiceWorkerGlobalScope::stopFetch() |
| 77 { | 76 { |
| 78 m_fetchManager.clear(); | 77 m_fetchManager.clear(); |
| 79 } | 78 } |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 void ServiceWorkerGlobalScope::logExceptionToConsole(const String& errorMessage,
int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRe
fPtrWillBeRawPtr<ScriptCallStack> callStack) | 190 void ServiceWorkerGlobalScope::logExceptionToConsole(const String& errorMessage,
int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRe
fPtrWillBeRawPtr<ScriptCallStack> callStack) |
| 192 { | 191 { |
| 193 WorkerGlobalScope::logExceptionToConsole(errorMessage, scriptId, sourceURL,
lineNumber, columnNumber, callStack); | 192 WorkerGlobalScope::logExceptionToConsole(errorMessage, scriptId, sourceURL,
lineNumber, columnNumber, callStack); |
| 194 RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(J
SMessageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber); | 193 RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(J
SMessageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber); |
| 195 consoleMessage->setScriptId(scriptId); | 194 consoleMessage->setScriptId(scriptId); |
| 196 consoleMessage->setCallStack(callStack); | 195 consoleMessage->setCallStack(callStack); |
| 197 addMessageToWorkerConsole(consoleMessage.release()); | 196 addMessageToWorkerConsole(consoleMessage.release()); |
| 198 } | 197 } |
| 199 | 198 |
| 200 } // namespace blink | 199 } // namespace blink |
| OLD | NEW |