| 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 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId); | 271 LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId); |
| 272 if (frame && frame->page()) { | 272 if (frame && frame->page()) { |
| 273 frame->page()->useCounter().unmuteForInspector(); | 273 frame->page()->useCounter().unmuteForInspector(); |
| 274 frame->page()->deprecation().unmuteForInspector(); | 274 frame->page()->deprecation().unmuteForInspector(); |
| 275 } | 275 } |
| 276 } | 276 } |
| 277 | 277 |
| 278 v8::Local<v8::Context> MainThreadDebugger::ensureDefaultContextInGroup( | 278 v8::Local<v8::Context> MainThreadDebugger::ensureDefaultContextInGroup( |
| 279 int contextGroupId) { | 279 int contextGroupId) { |
| 280 LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId); | 280 LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId); |
| 281 ScriptState* scriptState = frame ? ScriptState::forMainWorld(frame) : nullptr; | 281 ScriptState* scriptState = frame ? toScriptStateForMainWorld(frame) : nullptr; |
| 282 return scriptState ? scriptState->context() : v8::Local<v8::Context>(); | 282 return scriptState ? scriptState->context() : v8::Local<v8::Context>(); |
| 283 } | 283 } |
| 284 | 284 |
| 285 void MainThreadDebugger::beginEnsureAllContextsInGroup(int contextGroupId) { | 285 void MainThreadDebugger::beginEnsureAllContextsInGroup(int contextGroupId) { |
| 286 LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId); | 286 LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId); |
| 287 frame->settings()->setForceMainWorldInitialization(true); | 287 frame->settings()->setForceMainWorldInitialization(true); |
| 288 } | 288 } |
| 289 | 289 |
| 290 void MainThreadDebugger::endEnsureAllContextsInGroup(int contextGroupId) { | 290 void MainThreadDebugger::endEnsureAllContextsInGroup(int contextGroupId) { |
| 291 LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId); | 291 LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId); |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 464 context, nodes, index++, | 464 context, nodes, index++, |
| 465 ToV8(node, info.Holder(), info.GetIsolate())) | 465 ToV8(node, info.Holder(), info.GetIsolate())) |
| 466 .FromMaybe(false)) | 466 .FromMaybe(false)) |
| 467 return; | 467 return; |
| 468 } | 468 } |
| 469 info.GetReturnValue().Set(nodes); | 469 info.GetReturnValue().Set(nodes); |
| 470 } | 470 } |
| 471 } | 471 } |
| 472 | 472 |
| 473 } // namespace blink | 473 } // namespace blink |
| OLD | NEW |