diff --git a/common.gypi b/common.gypi index 0a5a8ecc19fd2f..bf9556e77bd364 100644 --- a/common.gypi +++ b/common.gypi @@ -37,7 +37,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.6', + 'v8_embedder_string': '-node.7', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/include/v8.h b/deps/v8/include/v8.h index f76fd34183a342..ac96091ef6b284 100644 --- a/deps/v8/include/v8.h +++ b/deps/v8/include/v8.h @@ -6497,10 +6497,6 @@ class V8_EXPORT Extension { // NOLINT bool auto_enable_; }; -V8_DEPRECATED( - "Use unique_ptr version or stop using extension (http://crbug.com/334679).", - void V8_EXPORT RegisterExtension(Extension* extension)); - void V8_EXPORT RegisterExtension(std::unique_ptr); // --- Statics --- diff --git a/deps/v8/src/api.cc b/deps/v8/src/api.cc index 657c93419c7c6c..6742907a700d25 100644 --- a/deps/v8/src/api.cc +++ b/deps/v8/src/api.cc @@ -898,19 +898,9 @@ void V8::SetFlagsFromCommandLine(int* argc, char** argv, bool remove_flags) { RegisteredExtension* RegisteredExtension::first_extension_ = nullptr; -RegisteredExtension::RegisteredExtension(Extension* extension) - : legacy_unowned_extension_(extension) {} - RegisteredExtension::RegisteredExtension(std::unique_ptr extension) : extension_(std::move(extension)) {} -// static -void RegisteredExtension::Register(Extension* extension) { - RegisteredExtension* new_extension = new RegisteredExtension(extension); - new_extension->next_ = first_extension_; - first_extension_ = new_extension; -} - // static void RegisteredExtension::Register(std::unique_ptr extension) { RegisteredExtension* new_extension = @@ -946,8 +936,6 @@ class ExtensionResource : public String::ExternalOneByteStringResource { }; } // anonymous namespace -void RegisterExtension(Extension* that) { RegisteredExtension::Register(that); } - void RegisterExtension(std::unique_ptr extension) { RegisteredExtension::Register(std::move(extension)); } diff --git a/deps/v8/src/api.h b/deps/v8/src/api.h index 40f4e18025395e..5491a9ece5cc01 100644 --- a/deps/v8/src/api.h +++ b/deps/v8/src/api.h @@ -71,20 +71,14 @@ class ApiFunction { class RegisteredExtension { public: - static void Register(Extension*); static void Register(std::unique_ptr); static void UnregisterAll(); - Extension* extension() const { - return legacy_unowned_extension_ ? legacy_unowned_extension_ - : extension_.get(); - } + Extension* extension() const { return extension_.get(); } RegisteredExtension* next() const { return next_; } static RegisteredExtension* first_extension() { return first_extension_; } private: explicit RegisteredExtension(Extension*); explicit RegisteredExtension(std::unique_ptr); - // TODO(clemensh): Remove this after the 7.4 branch. - Extension* legacy_unowned_extension_ = nullptr; std::unique_ptr extension_; RegisteredExtension* next_ = nullptr; static RegisteredExtension* first_extension_;