| 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/frame/LocalDOMWindow.h" |
| 36 #include "core/frame/LocalFrame.h" | 37 #include "core/frame/LocalFrame.h" |
| 37 #include "core/inspector/InspectorTaskRunner.h" | 38 #include "core/inspector/InspectorTaskRunner.h" |
| 38 #include "core/inspector/v8/V8Debugger.h" | 39 #include "core/inspector/v8/V8Debugger.h" |
| 39 #include "platform/UserGestureIndicator.h" | 40 #include "platform/UserGestureIndicator.h" |
| 40 #include "wtf/OwnPtr.h" | 41 #include "wtf/OwnPtr.h" |
| 41 #include "wtf/PassOwnPtr.h" | 42 #include "wtf/PassOwnPtr.h" |
| 42 #include "wtf/ThreadingPrimitives.h" | 43 #include "wtf/ThreadingPrimitives.h" |
| 43 | 44 |
| 44 namespace blink { | 45 namespace blink { |
| 45 | 46 |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 token->setPauseInDebugger(); | 118 token->setPauseInDebugger(); |
| 118 // Wait for continue or step command. | 119 // Wait for continue or step command. |
| 119 m_clientMessageLoop->run(pausedFrame); | 120 m_clientMessageLoop->run(pausedFrame); |
| 120 } | 121 } |
| 121 | 122 |
| 122 void MainThreadDebugger::quitMessageLoopOnPause() | 123 void MainThreadDebugger::quitMessageLoopOnPause() |
| 123 { | 124 { |
| 124 m_clientMessageLoop->quitNow(); | 125 m_clientMessageLoop->quitNow(); |
| 125 } | 126 } |
| 126 | 127 |
| 127 bool MainThreadDebugger::callingContextCanAccessContext(v8::Local<v8::Context> c
ontext) | 128 bool MainThreadDebugger::callingContextCanAccessContext(v8::Local<v8::Context> c
alling, v8::Local<v8::Context> target) |
| 128 { | 129 { |
| 129 if (context.IsEmpty()) | 130 DOMWindow* window = toDOMWindow(target); |
| 130 return false; | 131 return window && BindingSecurity::shouldAllowAccessTo(m_isolate, toLocalDOMW
indow(toDOMWindow(calling)), window, DoNotReportSecurityError); |
| 131 DOMWindow* window = toDOMWindow(context->GetIsolate(), context->Global()); | |
| 132 return window && BindingSecurity::shouldAllowAccessTo(context->GetIsolate(),
callingDOMWindow(context->GetIsolate()), window, DoNotReportSecurityError); | |
| 133 } | 132 } |
| 134 | 133 |
| 135 } // namespace blink | 134 } // namespace blink |
| OLD | NEW |