Index: vm/isolate.h |
=================================================================== |
--- vm/isolate.h (revision 6251) |
+++ vm/isolate.h (working copy) |
@@ -8,6 +8,7 @@ |
#include "include/dart_api.h" |
#include "platform/assert.h" |
#include "platform/thread.h" |
+#include "vm/base_isolate.h" |
#include "vm/gc_callbacks.h" |
#include "vm/store_buffer.h" |
#include "vm/timer.h" |
@@ -33,7 +34,7 @@ |
class Zone; |
-class Isolate { |
+class Isolate : public BaseIsolate { |
public: |
~Isolate(); |
@@ -83,9 +84,6 @@ |
return OFFSET_OF(Isolate, object_store_); |
} |
- StackResource* top_resource() const { return top_resource_; } |
- void set_top_resource(StackResource* value) { top_resource_ = value; } |
- |
RawContext* top_context() const { return top_context_; } |
void set_top_context(RawContext* value) { top_context_ = value; } |
static intptr_t top_context_offset() { |
@@ -117,8 +115,6 @@ |
TimerList& timer_list() { return timer_list_; } |
- Zone* current_zone() const { return current_zone_; } |
- void set_current_zone(Zone* zone) { current_zone_ = zone; } |
static intptr_t current_zone_offset() { |
return OFFSET_OF(Isolate, current_zone_); |
} |
@@ -263,9 +259,7 @@ |
Dart_Port main_port_; |
Heap* heap_; |
ObjectStore* object_store_; |
- StackResource* top_resource_; |
RawContext* top_context_; |
- Zone* current_zone_; |
#if defined(DEBUG) |
int32_t no_gc_scope_depth_; |
int32_t no_handle_scope_depth_; |