| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2010-2011 Google Inc. All rights reserved. | 2 * Copyright (c) 2010-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 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 340 v8::HandleScope scope(m_isolate); | 340 v8::HandleScope scope(m_isolate); |
| 341 v8::Handle<v8::Context> pausedContext = m_pausedContext.IsEmpty() ? m_isolat
e->GetCurrentContext() : m_pausedContext; | 341 v8::Handle<v8::Context> pausedContext = m_pausedContext.IsEmpty() ? m_isolat
e->GetCurrentContext() : m_pausedContext; |
| 342 if (pausedContext.IsEmpty()) | 342 if (pausedContext.IsEmpty()) |
| 343 return ScriptValue(); | 343 return ScriptValue(); |
| 344 | 344 |
| 345 RefPtr<JavaScriptCallFrame> currentCallFrame = wrapCallFrames(0, scopeDetail
s); | 345 RefPtr<JavaScriptCallFrame> currentCallFrame = wrapCallFrames(0, scopeDetail
s); |
| 346 if (!currentCallFrame) | 346 if (!currentCallFrame) |
| 347 return ScriptValue(); | 347 return ScriptValue(); |
| 348 | 348 |
| 349 v8::Context::Scope contextScope(pausedContext); | 349 v8::Context::Scope contextScope(pausedContext); |
| 350 return ScriptValue(ScriptState::from(pausedContext), toV8(currentCallFrame.r
elease(), v8::Handle<v8::Object>(), pausedContext->GetIsolate())); | 350 return ScriptValue(ScriptState::from(pausedContext), toV8(currentCallFrame.r
elease(), pausedContext->Global(), pausedContext->GetIsolate())); |
| 351 } | 351 } |
| 352 | 352 |
| 353 ScriptValue ScriptDebugServer::currentCallFrames() | 353 ScriptValue ScriptDebugServer::currentCallFrames() |
| 354 { | 354 { |
| 355 return currentCallFramesInner(AllScopes); | 355 return currentCallFramesInner(AllScopes); |
| 356 } | 356 } |
| 357 | 357 |
| 358 ScriptValue ScriptDebugServer::currentCallFramesForAsyncStack() | 358 ScriptValue ScriptDebugServer::currentCallFramesForAsyncStack() |
| 359 { | 359 { |
| 360 return currentCallFramesInner(FastAsyncScopes); | 360 return currentCallFramesInner(FastAsyncScopes); |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 618 { | 618 { |
| 619 return PassOwnPtr<ScriptSourceCode>(); | 619 return PassOwnPtr<ScriptSourceCode>(); |
| 620 } | 620 } |
| 621 | 621 |
| 622 String ScriptDebugServer::preprocessEventListener(LocalFrame*, const String& sou
rce, const String& url, const String& functionName) | 622 String ScriptDebugServer::preprocessEventListener(LocalFrame*, const String& sou
rce, const String& url, const String& functionName) |
| 623 { | 623 { |
| 624 return source; | 624 return source; |
| 625 } | 625 } |
| 626 | 626 |
| 627 } // namespace WebCore | 627 } // namespace WebCore |
| OLD | NEW |