OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. |
3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com> | 3 * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com> |
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 * | 8 * |
9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 if (!script_state) | 133 if (!script_state) |
134 return; | 134 return; |
135 ScriptState::Scope scope(script_state); | 135 ScriptState::Scope scope(script_state); |
136 UserGestureIndicator gesture_indicator( | 136 UserGestureIndicator gesture_indicator( |
137 UserGestureToken::Create(frontend_frame_->GetDocument())); | 137 UserGestureToken::Create(frontend_frame_->GetDocument())); |
138 v8::MicrotasksScope microtasks(script_state->GetIsolate(), | 138 v8::MicrotasksScope microtasks(script_state->GetIsolate(), |
139 v8::MicrotasksScope::kRunMicrotasks); | 139 v8::MicrotasksScope::kRunMicrotasks); |
140 v8::Local<v8::String> source = | 140 v8::Local<v8::String> source = |
141 V8AtomicString(script_state->GetIsolate(), expression.Utf8().data()); | 141 V8AtomicString(script_state->GetIsolate(), expression.Utf8().data()); |
142 V8ScriptRunner::CompileAndRunInternalScript( | 142 V8ScriptRunner::CompileAndRunInternalScript( |
143 source, script_state->GetIsolate(), String(), TextPosition()); | 143 ExecutionContext::From(script_state), source, script_state->GetIsolate(), |
| 144 String(), TextPosition()); |
144 } | 145 } |
145 | 146 |
146 void DevToolsHost::DisconnectClient() { | 147 void DevToolsHost::DisconnectClient() { |
147 client_ = 0; | 148 client_ = 0; |
148 if (menu_provider_) { | 149 if (menu_provider_) { |
149 menu_provider_->Disconnect(); | 150 menu_provider_->Disconnect(); |
150 menu_provider_ = nullptr; | 151 menu_provider_ = nullptr; |
151 } | 152 } |
152 frontend_frame_ = nullptr; | 153 frontend_frame_ = nullptr; |
153 } | 154 } |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
221 | 222 |
222 bool DevToolsHost::isUnderTest() { | 223 bool DevToolsHost::isUnderTest() { |
223 return client_ && client_->IsUnderTest(); | 224 return client_ && client_->IsUnderTest(); |
224 } | 225 } |
225 | 226 |
226 bool DevToolsHost::isHostedMode() { | 227 bool DevToolsHost::isHostedMode() { |
227 return false; | 228 return false; |
228 } | 229 } |
229 | 230 |
230 } // namespace blink | 231 } // namespace blink |
OLD | NEW |