Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Side by Side Diff: Source/core/workers/WorkerMessagingProxy.cpp

Issue 376213002: DevTools: Make FrameConsole methods accept ConsoleMessage objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@scriptFailedToParse
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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/LocalDOMWindow.h" 36 #include "core/frame/LocalDOMWindow.h"
37 #include "core/frame/csp/ContentSecurityPolicy.h" 37 #include "core/frame/csp/ContentSecurityPolicy.h"
38 #include "core/inspector/ConsoleMessage.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/workers/DedicatedWorkerGlobalScope.h" 45 #include "core/workers/DedicatedWorkerGlobalScope.h"
45 #include "core/workers/DedicatedWorkerThread.h" 46 #include "core/workers/DedicatedWorkerThread.h"
46 #include "core/workers/Worker.h" 47 #include "core/workers/Worker.h"
47 #include "core/workers/WorkerClients.h" 48 #include "core/workers/WorkerClients.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 { 163 {
163 if (!m_workerObject) 164 if (!m_workerObject)
164 return; 165 return;
165 166
166 // We don't bother checking the askedToTerminate() flag here, because except ions should *always* be reported even if the thread is terminated. 167 // We don't bother checking the askedToTerminate() flag here, because except ions should *always* be reported even if the thread is terminated.
167 // This is intentionally different than the behavior in MessageWorkerTask, b ecause terminated workers no longer deliver messages (section 4.6 of the WebWork er spec), but they do report exceptions. 168 // This is intentionally different than the behavior in MessageWorkerTask, b ecause terminated workers no longer deliver messages (section 4.6 of the WebWork er spec), but they do report exceptions.
168 169
169 RefPtrWillBeRawPtr<ErrorEvent> event = ErrorEvent::create(errorMessage, sour ceURL, lineNumber, columnNumber, 0); 170 RefPtrWillBeRawPtr<ErrorEvent> event = ErrorEvent::create(errorMessage, sour ceURL, lineNumber, columnNumber, 0);
170 bool errorHandled = !m_workerObject->dispatchEvent(event); 171 bool errorHandled = !m_workerObject->dispatchEvent(event);
171 if (!errorHandled) 172 if (!errorHandled)
172 m_executionContext->reportException(event, nullptr, NotSharableCrossOrig in); 173 m_executionContext->reportException(event, ConsoleMessage::create(JSMess ageSource, ErrorMessageLevel, errorMessage, sourceURL, lineNumber, columnNumber) );
173 } 174 }
174 175
175 void WorkerMessagingProxy::reportConsoleMessage(MessageSource source, MessageLev el level, const String& message, int lineNumber, const String& sourceURL) 176 void WorkerMessagingProxy::reportConsoleMessage(MessageSource source, MessageLev el level, const String& message, int lineNumber, const String& sourceURL)
176 { 177 {
177 if (m_askedToTerminate) 178 if (m_askedToTerminate)
178 return; 179 return;
179 m_executionContext->addConsoleMessage(source, level, message, sourceURL, lin eNumber); 180 m_executionContext->addConsoleMessage(source, level, message, sourceURL, lin eNumber);
180 } 181 }
181 182
182 void WorkerMessagingProxy::workerThreadCreated(PassRefPtr<DedicatedWorkerThread> workerThread) 183 void WorkerMessagingProxy::workerThreadCreated(PassRefPtr<DedicatedWorkerThread> workerThread)
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 { 298 {
298 m_workerThreadHadPendingActivity = hasPendingActivity; 299 m_workerThreadHadPendingActivity = hasPendingActivity;
299 } 300 }
300 301
301 bool WorkerMessagingProxy::hasPendingActivity() const 302 bool WorkerMessagingProxy::hasPendingActivity() const
302 { 303 {
303 return (m_unconfirmedMessageCount || m_workerThreadHadPendingActivity) && !m _askedToTerminate; 304 return (m_unconfirmedMessageCount || m_workerThreadHadPendingActivity) && !m _askedToTerminate;
304 } 305 }
305 306
306 } // namespace WebCore 307 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698