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

Side by Side Diff: src/isolate.h

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/ic/x87/handler-compiler-x87.cc ('k') | src/isolate-inl.h » ('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 #ifndef V8_ISOLATE_H_ 5 #ifndef V8_ISOLATE_H_
6 #define V8_ISOLATE_H_ 6 #define V8_ISOLATE_H_
7 7
8 #include <queue> 8 #include <queue>
9 #include <set> 9 #include <set>
10 10
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 // Bottom JS entry. 610 // Bottom JS entry.
611 Address js_entry_sp() { 611 Address js_entry_sp() {
612 return thread_local_top_.js_entry_sp_; 612 return thread_local_top_.js_entry_sp_;
613 } 613 }
614 inline Address* js_entry_sp_address() { 614 inline Address* js_entry_sp_address() {
615 return &thread_local_top_.js_entry_sp_; 615 return &thread_local_top_.js_entry_sp_;
616 } 616 }
617 617
618 // Returns the global object of the current context. It could be 618 // Returns the global object of the current context. It could be
619 // a builtin object, or a JS global object. 619 // a builtin object, or a JS global object.
620 inline Handle<GlobalObject> global_object(); 620 inline Handle<JSGlobalObject> global_object();
621 621
622 // Returns the global proxy object of the current context. 622 // Returns the global proxy object of the current context.
623 JSObject* global_proxy() { 623 JSObject* global_proxy() {
624 return context()->global_proxy(); 624 return context()->global_proxy();
625 } 625 }
626 626
627 static int ArchiveSpacePerThread() { return sizeof(ThreadLocalTop); } 627 static int ArchiveSpacePerThread() { return sizeof(ThreadLocalTop); }
628 void FreeThreadResources() { thread_local_top_.Free(); } 628 void FreeThreadResources() { thread_local_top_.Free(); }
629 629
630 // This method is called by the api after operations that may throw 630 // This method is called by the api after operations that may throw
(...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after
1565 1565
1566 EmbeddedVector<char, 128> filename_; 1566 EmbeddedVector<char, 128> filename_;
1567 FILE* file_; 1567 FILE* file_;
1568 int scope_depth_; 1568 int scope_depth_;
1569 }; 1569 };
1570 1570
1571 } // namespace internal 1571 } // namespace internal
1572 } // namespace v8 1572 } // namespace v8
1573 1573
1574 #endif // V8_ISOLATE_H_ 1574 #endif // V8_ISOLATE_H_
OLDNEW
« no previous file with comments | « src/ic/x87/handler-compiler-x87.cc ('k') | src/isolate-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698