OLD | NEW |
1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 context_->Enter(); | 139 context_->Enter(); |
140 } | 140 } |
141 inline ~DebugLocalContext() { | 141 inline ~DebugLocalContext() { |
142 context_->Exit(); | 142 context_->Exit(); |
143 context_.Dispose(); | 143 context_.Dispose(); |
144 } | 144 } |
145 inline v8::Context* operator->() { return *context_; } | 145 inline v8::Context* operator->() { return *context_; } |
146 inline v8::Context* operator*() { return *context_; } | 146 inline v8::Context* operator*() { return *context_; } |
147 inline bool IsReady() { return !context_.IsEmpty(); } | 147 inline bool IsReady() { return !context_.IsEmpty(); } |
148 void ExposeDebug() { | 148 void ExposeDebug() { |
149 v8::internal::Debug* debug = v8::internal::Isolate::Current()->debug(); | 149 v8::internal::Isolate* isolate = v8::internal::Isolate::Current(); |
| 150 v8::internal::Debug* debug = isolate->debug(); |
150 // Expose the debug context global object in the global object for testing. | 151 // Expose the debug context global object in the global object for testing. |
151 debug->Load(); | 152 debug->Load(); |
152 debug->debug_context()->set_security_token( | 153 debug->debug_context()->set_security_token( |
153 v8::Utils::OpenHandle(*context_)->security_token()); | 154 v8::Utils::OpenHandle(*context_)->security_token()); |
154 | 155 |
155 Handle<JSGlobalProxy> global(Handle<JSGlobalProxy>::cast( | 156 Handle<JSGlobalProxy> global(Handle<JSGlobalProxy>::cast( |
156 v8::Utils::OpenHandle(*context_->Global()))); | 157 v8::Utils::OpenHandle(*context_->Global()))); |
157 Handle<v8::internal::String> debug_string = | 158 Handle<v8::internal::String> debug_string = |
158 FACTORY->LookupAsciiSymbol("debug"); | 159 FACTORY->LookupAsciiSymbol("debug"); |
159 SetProperty(global, debug_string, | 160 SetProperty(isolate, global, debug_string, |
160 Handle<Object>(debug->debug_context()->global_proxy()), DONT_ENUM, | 161 Handle<Object>(debug->debug_context()->global_proxy()), DONT_ENUM, |
161 ::v8::internal::kNonStrictMode); | 162 ::v8::internal::kNonStrictMode); |
162 } | 163 } |
163 | 164 |
164 private: | 165 private: |
165 v8::Persistent<v8::Context> context_; | 166 v8::Persistent<v8::Context> context_; |
166 }; | 167 }; |
167 | 168 |
168 | 169 |
169 // --- H e l p e r F u n c t i o n s | 170 // --- H e l p e r F u n c t i o n s |
(...skipping 7355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
7525 TEST(LiveEditDisabled) { | 7526 TEST(LiveEditDisabled) { |
7526 v8::internal::FLAG_allow_natives_syntax = true; | 7527 v8::internal::FLAG_allow_natives_syntax = true; |
7527 v8::HandleScope scope; | 7528 v8::HandleScope scope; |
7528 LocalContext context; | 7529 LocalContext context; |
7529 v8::Debug::SetLiveEditEnabled(false); | 7530 v8::Debug::SetLiveEditEnabled(false); |
7530 CompileRun("%LiveEditCompareStrings('', '')"); | 7531 CompileRun("%LiveEditCompareStrings('', '')"); |
7531 } | 7532 } |
7532 | 7533 |
7533 | 7534 |
7534 #endif // ENABLE_DEBUGGER_SUPPORT | 7535 #endif // ENABLE_DEBUGGER_SUPPORT |
OLD | NEW |