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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 WebDevToolsAgent* devtoolsAgent = m_mainFrame->devToolsAgent(); | 226 WebDevToolsAgent* devtoolsAgent = m_mainFrame->devToolsAgent(); |
227 if (devtoolsAgent) | 227 if (devtoolsAgent) |
228 devtoolsAgent->dispatchOnInspectorBackend(sessionId, callId, method, | 228 devtoolsAgent->dispatchOnInspectorBackend(sessionId, callId, method, |
229 message); | 229 message); |
230 } | 230 } |
231 | 231 |
232 void WebEmbeddedWorkerImpl::addMessageToConsole( | 232 void WebEmbeddedWorkerImpl::addMessageToConsole( |
233 const WebConsoleMessage& message) { | 233 const WebConsoleMessage& message) { |
234 MessageLevel webCoreMessageLevel; | 234 MessageLevel webCoreMessageLevel; |
235 switch (message.level) { | 235 switch (message.level) { |
236 case WebConsoleMessage::LevelDebug: | 236 case WebConsoleMessage::LevelVerbose: |
237 webCoreMessageLevel = DebugMessageLevel; | 237 webCoreMessageLevel = VerboseMessageLevel; |
238 break; | 238 break; |
239 case WebConsoleMessage::LevelLog: | 239 case WebConsoleMessage::LevelInfo: |
240 webCoreMessageLevel = LogMessageLevel; | 240 webCoreMessageLevel = InfoMessageLevel; |
241 break; | 241 break; |
242 case WebConsoleMessage::LevelWarning: | 242 case WebConsoleMessage::LevelWarning: |
243 webCoreMessageLevel = WarningMessageLevel; | 243 webCoreMessageLevel = WarningMessageLevel; |
244 break; | 244 break; |
245 case WebConsoleMessage::LevelError: | 245 case WebConsoleMessage::LevelError: |
246 webCoreMessageLevel = ErrorMessageLevel; | 246 webCoreMessageLevel = ErrorMessageLevel; |
247 break; | 247 break; |
248 default: | 248 default: |
249 NOTREACHED(); | 249 NOTREACHED(); |
250 return; | 250 return; |
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
475 *this, *document, *m_workerContextClient); | 475 *this, *document, *m_workerContextClient); |
476 m_loaderProxy = WorkerLoaderProxy::create(this); | 476 m_loaderProxy = WorkerLoaderProxy::create(this); |
477 m_workerThread = | 477 m_workerThread = |
478 ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalScopeProxy); | 478 ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalScopeProxy); |
479 m_workerThread->start(std::move(startupData)); | 479 m_workerThread->start(std::move(startupData)); |
480 m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(), | 480 m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(), |
481 scriptURL); | 481 scriptURL); |
482 } | 482 } |
483 | 483 |
484 } // namespace blink | 484 } // namespace blink |
OLD | NEW |