OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Apple Inc. All rights reserved. | 2 * Copyright (C) 2013 Apple 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 | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * | 7 * |
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 19 matching lines...) Expand all Loading... |
30 #include "core/frame/FrameConsole.h" | 30 #include "core/frame/FrameConsole.h" |
31 | 31 |
32 #include "core/frame/FrameHost.h" | 32 #include "core/frame/FrameHost.h" |
33 #include "core/inspector/ConsoleAPITypes.h" | 33 #include "core/inspector/ConsoleAPITypes.h" |
34 #include "core/inspector/ConsoleMessage.h" | 34 #include "core/inspector/ConsoleMessage.h" |
35 #include "core/inspector/InspectorConsoleInstrumentation.h" | 35 #include "core/inspector/InspectorConsoleInstrumentation.h" |
36 #include "core/inspector/ScriptCallStack.h" | 36 #include "core/inspector/ScriptCallStack.h" |
37 #include "core/page/Chrome.h" | 37 #include "core/page/Chrome.h" |
38 #include "core/page/ChromeClient.h" | 38 #include "core/page/ChromeClient.h" |
39 #include "core/page/Page.h" | 39 #include "core/page/Page.h" |
| 40 #include "core/workers/WorkerGlobalScopeProxy.h" |
40 #include "wtf/text/StringBuilder.h" | 41 #include "wtf/text/StringBuilder.h" |
41 | 42 |
42 namespace blink { | 43 namespace blink { |
43 | 44 |
44 namespace { | 45 namespace { |
45 | 46 |
46 int muteCount = 0; | 47 int muteCount = 0; |
47 | 48 |
48 } | 49 } |
49 | 50 |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 { | 105 { |
105 muteCount++; | 106 muteCount++; |
106 } | 107 } |
107 | 108 |
108 void FrameConsole::unmute() | 109 void FrameConsole::unmute() |
109 { | 110 { |
110 ASSERT(muteCount > 0); | 111 ASSERT(muteCount > 0); |
111 muteCount--; | 112 muteCount--; |
112 } | 113 } |
113 | 114 |
| 115 void FrameConsole::adoptWorkerConsoleMessages(WorkerGlobalScopeProxy* proxy) |
| 116 { |
| 117 InspectorInstrumentation::adoptWorkerConsoleMessages(m_frame.document(), pro
xy); |
| 118 } |
| 119 |
114 } // namespace blink | 120 } // namespace blink |
OLD | NEW |