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 16 matching lines...) Expand all Loading... |
27 | 27 |
28 | 28 |
29 #include "core/workers/InProcessWorkerMessagingProxy.h" | 29 #include "core/workers/InProcessWorkerMessagingProxy.h" |
30 | 30 |
31 #include "bindings/core/v8/V8GCController.h" | 31 #include "bindings/core/v8/V8GCController.h" |
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/dom/SecurityContext.h" | 34 #include "core/dom/SecurityContext.h" |
35 #include "core/events/ErrorEvent.h" | 35 #include "core/events/ErrorEvent.h" |
36 #include "core/events/MessageEvent.h" | 36 #include "core/events/MessageEvent.h" |
37 #include "core/frame/Console.h" | |
38 #include "core/frame/FrameConsole.h" | 37 #include "core/frame/FrameConsole.h" |
39 #include "core/frame/LocalFrame.h" | 38 #include "core/frame/LocalFrame.h" |
40 #include "core/frame/csp/ContentSecurityPolicy.h" | 39 #include "core/frame/csp/ContentSecurityPolicy.h" |
41 #include "core/inspector/ConsoleMessage.h" | 40 #include "core/inspector/ConsoleMessage.h" |
42 #include "core/loader/DocumentLoadTiming.h" | 41 #include "core/loader/DocumentLoadTiming.h" |
43 #include "core/loader/DocumentLoader.h" | 42 #include "core/loader/DocumentLoader.h" |
44 #include "core/workers/InProcessWorkerBase.h" | 43 #include "core/workers/InProcessWorkerBase.h" |
45 #include "core/workers/InProcessWorkerObjectProxy.h" | 44 #include "core/workers/InProcessWorkerObjectProxy.h" |
46 #include "core/workers/WorkerClients.h" | 45 #include "core/workers/WorkerClients.h" |
47 #include "core/workers/WorkerInspectorProxy.h" | 46 #include "core/workers/WorkerInspectorProxy.h" |
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
279 | 278 |
280 // FIXME: This need to be revisited when we support nested worker one day | 279 // FIXME: This need to be revisited when we support nested worker one day |
281 ASSERT(m_executionContext->isDocument()); | 280 ASSERT(m_executionContext->isDocument()); |
282 Document* document = toDocument(m_executionContext.get()); | 281 Document* document = toDocument(m_executionContext.get()); |
283 LocalFrame* frame = document->frame(); | 282 LocalFrame* frame = document->frame(); |
284 if (frame) | 283 if (frame) |
285 frame->console().adoptWorkerMessagesAfterTermination(m_workerInspectorPr
oxy.get()); | 284 frame->console().adoptWorkerMessagesAfterTermination(m_workerInspectorPr
oxy.get()); |
286 } | 285 } |
287 | 286 |
288 } // namespace blink | 287 } // namespace blink |
OLD | NEW |