OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2011 Google Inc. All rights reserved. | 2 * Copyright (c) 2011 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 15 matching lines...) Expand all Loading... |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "core/inspector/MainThreadDebugger.h" | 31 #include "core/inspector/MainThreadDebugger.h" |
32 | 32 |
33 #include "bindings/core/v8/BindingSecurity.h" | 33 #include "bindings/core/v8/BindingSecurity.h" |
34 #include "bindings/core/v8/DOMWrapperWorld.h" | 34 #include "bindings/core/v8/DOMWrapperWorld.h" |
35 #include "bindings/core/v8/V8Window.h" | 35 #include "bindings/core/v8/V8Window.h" |
| 36 #include "core/dom/ExecutionContext.h" |
36 #include "core/frame/FrameConsole.h" | 37 #include "core/frame/FrameConsole.h" |
37 #include "core/frame/LocalDOMWindow.h" | 38 #include "core/frame/LocalDOMWindow.h" |
38 #include "core/frame/LocalFrame.h" | 39 #include "core/frame/LocalFrame.h" |
39 #include "core/frame/UseCounter.h" | 40 #include "core/frame/UseCounter.h" |
40 #include "core/inspector/InspectorTaskRunner.h" | 41 #include "core/inspector/InspectorTaskRunner.h" |
| 42 #include "core/workers/MainThreadWorkletGlobalScope.h" |
41 #include "platform/UserGestureIndicator.h" | 43 #include "platform/UserGestureIndicator.h" |
42 #include "platform/v8_inspector/public/V8Debugger.h" | 44 #include "platform/v8_inspector/public/V8Debugger.h" |
43 #include "wtf/OwnPtr.h" | 45 #include "wtf/OwnPtr.h" |
44 #include "wtf/PassOwnPtr.h" | 46 #include "wtf/PassOwnPtr.h" |
45 #include "wtf/ThreadingPrimitives.h" | 47 #include "wtf/ThreadingPrimitives.h" |
46 | 48 |
47 namespace blink { | 49 namespace blink { |
48 | 50 |
49 namespace { | 51 namespace { |
50 | 52 |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 } | 138 } |
137 | 139 |
138 void MainThreadDebugger::unmuteWarningsAndDeprecations() | 140 void MainThreadDebugger::unmuteWarningsAndDeprecations() |
139 { | 141 { |
140 FrameConsole::unmute(); | 142 FrameConsole::unmute(); |
141 UseCounter::unmuteForInspector(); | 143 UseCounter::unmuteForInspector(); |
142 } | 144 } |
143 | 145 |
144 bool MainThreadDebugger::callingContextCanAccessContext(v8::Local<v8::Context> c
alling, v8::Local<v8::Context> target) | 146 bool MainThreadDebugger::callingContextCanAccessContext(v8::Local<v8::Context> c
alling, v8::Local<v8::Context> target) |
145 { | 147 { |
| 148 ExecutionContext* executionContext = toExecutionContext(target); |
| 149 ASSERT(executionContext); |
| 150 |
| 151 if (executionContext->isWorkletGlobalScope()) { |
| 152 MainThreadWorkletGlobalScope* globalScope = toMainThreadWorkletGlobalSco
pe(executionContext); |
| 153 return globalScope && BindingSecurity::shouldAllowAccessTo(m_isolate, to
LocalDOMWindow(toDOMWindow(calling)), globalScope, DoNotReportSecurityError); |
| 154 } |
| 155 |
146 DOMWindow* window = toDOMWindow(target); | 156 DOMWindow* window = toDOMWindow(target); |
147 return window && BindingSecurity::shouldAllowAccessTo(m_isolate, toLocalDOMW
indow(toDOMWindow(calling)), window, DoNotReportSecurityError); | 157 return window && BindingSecurity::shouldAllowAccessTo(m_isolate, toLocalDOMW
indow(toDOMWindow(calling)), window, DoNotReportSecurityError); |
148 } | 158 } |
149 | 159 |
150 } // namespace blink | 160 } // namespace blink |
OLD | NEW |