| OLD | NEW |
| 1 // Copyright 2006-2008 the V8 project authors. All rights reserved. | 1 // Copyright 2006-2008 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| (...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 828 v8::Handle<ObjectTemplate>(), | 828 v8::Handle<ObjectTemplate>(), |
| 829 NULL); | 829 NULL); |
| 830 | 830 |
| 831 // Use the debugger context. | 831 // Use the debugger context. |
| 832 SaveContext save; | 832 SaveContext save; |
| 833 Top::set_context(*context); | 833 Top::set_context(*context); |
| 834 | 834 |
| 835 // Expose the builtins object in the debugger context. | 835 // Expose the builtins object in the debugger context. |
| 836 Handle<String> key = Factory::LookupAsciiSymbol("builtins"); | 836 Handle<String> key = Factory::LookupAsciiSymbol("builtins"); |
| 837 Handle<GlobalObject> global = Handle<GlobalObject>(context->global()); | 837 Handle<GlobalObject> global = Handle<GlobalObject>(context->global()); |
| 838 SetProperty(global, key, Handle<Object>(global->builtins()), NONE); | 838 RETURN_IF_EMPTY_HANDLE_VALUE( |
| 839 SetProperty(global, key, Handle<Object>(global->builtins()), NONE), |
| 840 false); |
| 839 | 841 |
| 840 // Compile the JavaScript for the debugger in the debugger context. | 842 // Compile the JavaScript for the debugger in the debugger context. |
| 841 Debugger::set_compiling_natives(true); | 843 Debugger::set_compiling_natives(true); |
| 842 bool caught_exception = | 844 bool caught_exception = |
| 843 !CompileDebuggerScript(Natives::GetIndex("mirror")) || | 845 !CompileDebuggerScript(Natives::GetIndex("mirror")) || |
| 844 !CompileDebuggerScript(Natives::GetIndex("debug")); | 846 !CompileDebuggerScript(Natives::GetIndex("debug")); |
| 845 | 847 |
| 846 if (FLAG_enable_liveedit) { | 848 if (FLAG_enable_liveedit) { |
| 847 caught_exception = caught_exception || | 849 caught_exception = caught_exception || |
| 848 !CompileDebuggerScript(Natives::GetIndex("liveedit")); | 850 !CompileDebuggerScript(Natives::GetIndex("liveedit")); |
| (...skipping 2224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3073 { | 3075 { |
| 3074 Locker locker; | 3076 Locker locker; |
| 3075 Debugger::CallMessageDispatchHandler(); | 3077 Debugger::CallMessageDispatchHandler(); |
| 3076 } | 3078 } |
| 3077 } | 3079 } |
| 3078 } | 3080 } |
| 3079 | 3081 |
| 3080 #endif // ENABLE_DEBUGGER_SUPPORT | 3082 #endif // ENABLE_DEBUGGER_SUPPORT |
| 3081 | 3083 |
| 3082 } } // namespace v8::internal | 3084 } } // namespace v8::internal |
| OLD | NEW |