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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 void MainThreadDebugger::contextCreated(ScriptState* scriptState, | 139 void MainThreadDebugger::contextCreated(ScriptState* scriptState, |
140 LocalFrame* frame, | 140 LocalFrame* frame, |
141 SecurityOrigin* origin) { | 141 SecurityOrigin* origin) { |
142 ASSERT(isMainThread()); | 142 ASSERT(isMainThread()); |
143 v8::HandleScope handles(scriptState->isolate()); | 143 v8::HandleScope handles(scriptState->isolate()); |
144 DOMWrapperWorld& world = scriptState->world(); | 144 DOMWrapperWorld& world = scriptState->world(); |
145 std::unique_ptr<protocol::DictionaryValue> auxDataValue = | 145 std::unique_ptr<protocol::DictionaryValue> auxDataValue = |
146 protocol::DictionaryValue::create(); | 146 protocol::DictionaryValue::create(); |
147 auxDataValue->setBoolean("isDefault", world.isMainWorld()); | 147 auxDataValue->setBoolean("isDefault", world.isMainWorld()); |
148 auxDataValue->setString("frameId", IdentifiersFactory::frameId(frame)); | 148 auxDataValue->setString("frameId", IdentifiersFactory::frameId(frame)); |
149 String auxData = auxDataValue->toJSONString(); | 149 String auxData = auxDataValue->serialize(); |
150 String humanReadableName = world.isIsolatedWorld() | 150 String humanReadableName = world.isIsolatedWorld() |
151 ? world.isolatedWorldHumanReadableName() | 151 ? world.isolatedWorldHumanReadableName() |
152 : String(); | 152 : String(); |
153 String originString = origin ? origin->toRawString() : String(); | 153 String originString = origin ? origin->toRawString() : String(); |
154 v8_inspector::V8ContextInfo contextInfo( | 154 v8_inspector::V8ContextInfo contextInfo( |
155 scriptState->context(), contextGroupId(frame), | 155 scriptState->context(), contextGroupId(frame), |
156 toV8InspectorStringView(humanReadableName)); | 156 toV8InspectorStringView(humanReadableName)); |
157 contextInfo.origin = toV8InspectorStringView(originString); | 157 contextInfo.origin = toV8InspectorStringView(originString); |
158 contextInfo.auxData = toV8InspectorStringView(auxData); | 158 contextInfo.auxData = toV8InspectorStringView(auxData); |
159 contextInfo.hasMemoryOnConsole = | 159 contextInfo.hasMemoryOnConsole = |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
454 context, nodes, index++, | 454 context, nodes, index++, |
455 toV8(node, info.Holder(), info.GetIsolate())) | 455 toV8(node, info.Holder(), info.GetIsolate())) |
456 .FromMaybe(false)) | 456 .FromMaybe(false)) |
457 return; | 457 return; |
458 } | 458 } |
459 info.GetReturnValue().Set(nodes); | 459 info.GetReturnValue().Set(nodes); |
460 } | 460 } |
461 } | 461 } |
462 | 462 |
463 } // namespace blink | 463 } // namespace blink |
OLD | NEW |