src: move TickInfo out of Environment

joyeecheung · targos · commit bc69a8127686 · 2019-03-27T22:16:23.000+01:00
PR-URL: #26824 Refs: #26776 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/api/callback.cc b/src/api/callback.cc
@@ -96,7 +96,7 @@ void InternalCallbackScope::Close() {
     return;
   }
 
-  Environment::TickInfo* tick_info = env_->tick_info();
+  TickInfo* tick_info = env_->tick_info();
 
   if (!env_->can_call_into_js()) return;
   if (!tick_info->has_tick_scheduled()) {
diff --git a/src/env-inl.h b/src/env-inl.h
@@ -268,18 +268,18 @@ inline void ImmediateInfo::ref_count_dec(uint32_t decrement) {
   fields_[kRefCount] -= decrement;
 }
 
-inline Environment::TickInfo::TickInfo(v8::Isolate* isolate)
+inline TickInfo::TickInfo(v8::Isolate* isolate)
     : fields_(isolate, kFieldsCount) {}
 
-inline AliasedBuffer<uint8_t, v8::Uint8Array>& Environment::TickInfo::fields() {
+inline AliasedBuffer<uint8_t, v8::Uint8Array>& TickInfo::fields() {
   return fields_;
 }
 
-inline bool Environment::TickInfo::has_tick_scheduled() const {
+inline bool TickInfo::has_tick_scheduled() const {
   return fields_[kHasTickScheduled] == 1;
 }
 
-inline bool Environment::TickInfo::has_rejection_to_warn() const {
+inline bool TickInfo::has_rejection_to_warn() const {
   return fields_[kHasRejectionToWarn] == 1;
 }
 
@@ -439,7 +439,7 @@ inline ImmediateInfo* Environment::immediate_info() {
   return &immediate_info_;
 }
 
-inline Environment::TickInfo* Environment::tick_info() {
+inline TickInfo* Environment::tick_info() {
   return &tick_info_;
 }
 
diff --git a/src/env.h b/src/env.h
@@ -642,6 +642,24 @@ class ImmediateInfo {
   AliasedBuffer<uint32_t, v8::Uint32Array> fields_;
 };
 
+class TickInfo {
+ public:
+  inline AliasedBuffer<uint8_t, v8::Uint8Array>& fields();
+  inline bool has_tick_scheduled() const;
+  inline bool has_rejection_to_warn() const;
+
+  TickInfo(const TickInfo&) = delete;
+  TickInfo& operator=(const TickInfo&) = delete;
+
+ private:
+  friend class Environment;  // So we can call the constructor.
+  inline explicit TickInfo(v8::Isolate* isolate);
+
+  enum Fields { kHasTickScheduled = 0, kHasRejectionToWarn, kFieldsCount };
+
+  AliasedBuffer<uint8_t, v8::Uint8Array> fields_;
+};
+
 class Environment {
  public:
   Environment(const Environment&) = delete;
@@ -651,28 +669,6 @@ class Environment {
   inline void PushAsyncCallbackScope();
   inline void PopAsyncCallbackScope();
 
-  class TickInfo {
-   public:
-    inline AliasedBuffer<uint8_t, v8::Uint8Array>& fields();
-    inline bool has_tick_scheduled() const;
-    inline bool has_rejection_to_warn() const;
-
-    TickInfo(const TickInfo&) = delete;
-    TickInfo& operator=(const TickInfo&) = delete;
-
-   private:
-    friend class Environment;  // So we can call the constructor.
-    inline explicit TickInfo(v8::Isolate* isolate);
-
-    enum Fields {
-      kHasTickScheduled = 0,
-      kHasRejectionToWarn,
-      kFieldsCount
-    };
-
-    AliasedBuffer<uint8_t, v8::Uint8Array> fields_;
-  };
-
   enum Flags {
     kNoFlags = 0,
     kIsMainThread = 1 << 0,

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ void InternalCallbackScope::Close() {`
`96`	`96`	`return;`
`97`	`97`	`}`
`98`	`98`
`99`		`- Environment::TickInfo* tick_info = env_->tick_info();`
	`99`	`+ TickInfo* tick_info = env_->tick_info();`
`100`	`100`
`101`	`101`	`if (!env_->can_call_into_js()) return;`
`102`	`102`	`if (!tick_info->has_tick_scheduled()) {`
Original file line number	Diff line number	Diff line change
`@@ -268,18 +268,18 @@ inline void ImmediateInfo::ref_count_dec(uint32_t decrement) {`
`268`	`268`	`fields_[kRefCount] -= decrement;`
`269`	`269`	`}`
`270`	`270`
`271`		`-inline Environment::TickInfo::TickInfo(v8::Isolate* isolate)`
	`271`	`+inline TickInfo::TickInfo(v8::Isolate* isolate)`
`272`	`272`	`: fields_(isolate, kFieldsCount) {}`
`273`	`273`
`274`		`-inline AliasedBuffer<uint8_t, v8::Uint8Array>& Environment::TickInfo::fields() {`
	`274`	`+inline AliasedBuffer<uint8_t, v8::Uint8Array>& TickInfo::fields() {`
`275`	`275`	`return fields_;`
`276`	`276`	`}`
`277`	`277`
`278`		`-inline bool Environment::TickInfo::has_tick_scheduled() const {`
	`278`	`+inline bool TickInfo::has_tick_scheduled() const {`
`279`	`279`	`return fields_[kHasTickScheduled] == 1;`
`280`	`280`	`}`
`281`	`281`
`282`		`-inline bool Environment::TickInfo::has_rejection_to_warn() const {`
	`282`	`+inline bool TickInfo::has_rejection_to_warn() const {`
`283`	`283`	`return fields_[kHasRejectionToWarn] == 1;`
`284`	`284`	`}`
`285`	`285`
`@@ -439,7 +439,7 @@ inline ImmediateInfo* Environment::immediate_info() {`
`439`	`439`	`return &immediate_info_;`
`440`	`440`	`}`
`441`	`441`
`442`		`-inline Environment::TickInfo* Environment::tick_info() {`
	`442`	`+inline TickInfo* Environment::tick_info() {`
`443`	`443`	`return &tick_info_;`
`444`	`444`	`}`
`445`	`445`