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 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
591 v8::Local<v8::Script> script = scriptHandle->newLocal(m_isolate); | 591 v8::Local<v8::Script> script = scriptHandle->newLocal(m_isolate); |
592 m_compiledScripts.remove(scriptId); | 592 m_compiledScripts.remove(scriptId); |
593 if (script.IsEmpty()) | 593 if (script.IsEmpty()) |
594 return; | 594 return; |
595 | 595 |
596 v8::Handle<v8::Context> context = state->context(); | 596 v8::Handle<v8::Context> context = state->context(); |
597 if (context.IsEmpty()) | 597 if (context.IsEmpty()) |
598 return; | 598 return; |
599 v8::Context::Scope contextScope(context); | 599 v8::Context::Scope contextScope(context); |
600 v8::TryCatch tryCatch; | 600 v8::TryCatch tryCatch; |
601 v8::Local<v8::Value> value = V8ScriptRunner::runCompiledScript(script, state
->scriptExecutionContext()); | 601 v8::Local<v8::Value> value = V8ScriptRunner::runCompiledScript(script, state
->scriptExecutionContext(), m_isolate); |
602 *wasThrown = false; | 602 *wasThrown = false; |
603 if (tryCatch.HasCaught()) { | 603 if (tryCatch.HasCaught()) { |
604 *wasThrown = true; | 604 *wasThrown = true; |
605 *result = ScriptValue(tryCatch.Exception()); | 605 *result = ScriptValue(tryCatch.Exception()); |
606 v8::Local<v8::Message> message = tryCatch.Message(); | 606 v8::Local<v8::Message> message = tryCatch.Message(); |
607 if (!message.IsEmpty()) | 607 if (!message.IsEmpty()) |
608 *exceptionMessage = toWebCoreStringWithUndefinedOrNullCheck(message-
>Get()); | 608 *exceptionMessage = toWebCoreStringWithUndefinedOrNullCheck(message-
>Get()); |
609 } else | 609 } else |
610 *result = ScriptValue(value); | 610 *result = ScriptValue(value); |
611 } | 611 } |
612 | 612 |
613 PassOwnPtr<ScriptSourceCode> ScriptDebugServer::preprocess(Frame*, const ScriptS
ourceCode&) | 613 PassOwnPtr<ScriptSourceCode> ScriptDebugServer::preprocess(Frame*, const ScriptS
ourceCode&) |
614 { | 614 { |
615 return PassOwnPtr<ScriptSourceCode>(); | 615 return PassOwnPtr<ScriptSourceCode>(); |
616 } | 616 } |
617 | 617 |
618 String ScriptDebugServer::preprocessEventListener(Frame*, const String& source,
const String& url, const String& functionName) | 618 String ScriptDebugServer::preprocessEventListener(Frame*, const String& source,
const String& url, const String& functionName) |
619 { | 619 { |
620 return source; | 620 return source; |
621 } | 621 } |
622 | 622 |
623 } // namespace WebCore | 623 } // namespace WebCore |
OLD | NEW |