Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(254)

Side by Side Diff: src/debug/debug.cc

Issue 1406113007: Merge GlobalObject with JSGlobalObject. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/debug/debug.h ('k') | src/debug/debug-scopes.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/debug/debug.h" 5 #include "src/debug/debug.h"
6 6
7 #include "src/api.h" 7 #include "src/api.h"
8 #include "src/arguments.h" 8 #include "src/arguments.h"
9 #include "src/bootstrapper.h" 9 #include "src/bootstrapper.h"
10 #include "src/code-stubs.h" 10 #include "src/code-stubs.h"
(...skipping 1578 matching lines...) Expand 10 before | Expand all | Expand 10 after
1589 Object** restarter_frame_function_pointer) { 1589 Object** restarter_frame_function_pointer) {
1590 if (mode != LiveEdit::CURRENTLY_SET_MODE) { 1590 if (mode != LiveEdit::CURRENTLY_SET_MODE) {
1591 thread_local_.frame_drop_mode_ = mode; 1591 thread_local_.frame_drop_mode_ = mode;
1592 } 1592 }
1593 thread_local_.break_frame_id_ = new_break_frame_id; 1593 thread_local_.break_frame_id_ = new_break_frame_id;
1594 thread_local_.restarter_frame_function_pointer_ = 1594 thread_local_.restarter_frame_function_pointer_ =
1595 restarter_frame_function_pointer; 1595 restarter_frame_function_pointer;
1596 } 1596 }
1597 1597
1598 1598
1599 bool Debug::IsDebugGlobal(GlobalObject* global) { 1599 bool Debug::IsDebugGlobal(JSGlobalObject* global) {
1600 return is_loaded() && global == debug_context()->global_object(); 1600 return is_loaded() && global == debug_context()->global_object();
1601 } 1601 }
1602 1602
1603 1603
1604 void Debug::ClearMirrorCache() { 1604 void Debug::ClearMirrorCache() {
1605 PostponeInterruptsScope postpone(isolate_); 1605 PostponeInterruptsScope postpone(isolate_);
1606 HandleScope scope(isolate_); 1606 HandleScope scope(isolate_);
1607 CallFunction("ClearMirrorCache", 0, NULL); 1607 CallFunction("ClearMirrorCache", 0, NULL);
1608 } 1608 }
1609 1609
(...skipping 628 matching lines...) Expand 10 before | Expand all | Expand 10 after
2238 2238
2239 StackLimitCheck check(isolate_); 2239 StackLimitCheck check(isolate_);
2240 if (check.HasOverflowed()) return; 2240 if (check.HasOverflowed()) return;
2241 2241
2242 { JavaScriptFrameIterator it(isolate_); 2242 { JavaScriptFrameIterator it(isolate_);
2243 DCHECK(!it.done()); 2243 DCHECK(!it.done());
2244 Object* fun = it.frame()->function(); 2244 Object* fun = it.frame()->function();
2245 if (fun && fun->IsJSFunction()) { 2245 if (fun && fun->IsJSFunction()) {
2246 // Don't stop in builtin functions. 2246 // Don't stop in builtin functions.
2247 if (!JSFunction::cast(fun)->IsSubjectToDebugging()) return; 2247 if (!JSFunction::cast(fun)->IsSubjectToDebugging()) return;
2248 GlobalObject* global = JSFunction::cast(fun)->context()->global_object(); 2248 JSGlobalObject* global =
2249 JSFunction::cast(fun)->context()->global_object();
2249 // Don't stop in debugger functions. 2250 // Don't stop in debugger functions.
2250 if (IsDebugGlobal(global)) return; 2251 if (IsDebugGlobal(global)) return;
2251 } 2252 }
2252 } 2253 }
2253 2254
2254 // Collect the break state before clearing the flags. 2255 // Collect the break state before clearing the flags.
2255 bool debug_command_only = isolate_->stack_guard()->CheckDebugCommand() && 2256 bool debug_command_only = isolate_->stack_guard()->CheckDebugCommand() &&
2256 !isolate_->stack_guard()->CheckDebugBreak(); 2257 !isolate_->stack_guard()->CheckDebugBreak();
2257 2258
2258 isolate_->stack_guard()->ClearDebugBreak(); 2259 isolate_->stack_guard()->ClearDebugBreak();
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
2580 } 2581 }
2581 2582
2582 2583
2583 void LockingCommandMessageQueue::Clear() { 2584 void LockingCommandMessageQueue::Clear() {
2584 base::LockGuard<base::Mutex> lock_guard(&mutex_); 2585 base::LockGuard<base::Mutex> lock_guard(&mutex_);
2585 queue_.Clear(); 2586 queue_.Clear();
2586 } 2587 }
2587 2588
2588 } // namespace internal 2589 } // namespace internal
2589 } // namespace v8 2590 } // namespace v8
OLDNEW
« no previous file with comments | « src/debug/debug.h ('k') | src/debug/debug-scopes.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698