fix: [wc|bw]-created events do not emit an event object (electron#19465)

codebytere · web-flow · commit aaca9011aeca · 2019-07-29T13:54:37.000-07:00
* fix: emit real Event instead of empty object in [wc|bw]

* chore: add ability to emit empty events
diff --git a/lib/browser/api/browser-window.js b/lib/browser/api/browser-window.js
@@ -82,7 +82,8 @@ BrowserWindow.prototype._init = function () {
   }
 
   // Notify the creation of the window.
-  app.emit('browser-window-created', {}, this)
+  const event = process.electronBinding('event').createEmpty()
+  app.emit('browser-window-created', event, this)
 
   Object.defineProperty(this, 'devToolsWebContents', {
     enumerable: true,
diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js
@@ -413,7 +413,8 @@ WebContents.prototype._init = function () {
     })
   }
 
-  app.emit('web-contents-created', {}, this)
+  const event = process.electronBinding('event').createEmpty()
+  app.emit('web-contents-created', event, this)
 }
 
 // Deprecations
diff --git a/shell/browser/api/atom_api_event.cc b/shell/browser/api/atom_api_event.cc
@@ -13,12 +13,17 @@ v8::Local<v8::Object> CreateWithSender(v8::Isolate* isolate,
   return mate::internal::CreateJSEvent(isolate, sender, nullptr, base::nullopt);
 }
 
+v8::Local<v8::Object> CreateEmpty(v8::Isolate* isolate) {
+  return mate::internal::CreateEmptyJSEvent(isolate);
+}
+
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,
                 v8::Local<v8::Context> context,
                 void* priv) {
   mate::Dictionary dict(context->GetIsolate(), exports);
   dict.SetMethod("createWithSender", &CreateWithSender);
+  dict.SetMethod("createEmpty", &CreateEmpty);
 }
 
 }  // namespace
diff --git a/shell/browser/api/event_emitter.cc b/shell/browser/api/event_emitter.cc
@@ -67,6 +67,13 @@ v8::Local<v8::Object> CreateJSEvent(
   return event;
 }
 
+v8::Local<v8::Object> CreateEmptyJSEvent(v8::Isolate* isolate) {
+  mate::Handle<mate::Event> native_event = mate::Event::Create(isolate);
+  v8::Local<v8::Object> event =
+      v8::Local<v8::Object>::Cast(native_event.ToV8());
+  return event;
+}
+
 v8::Local<v8::Object> CreateCustomEvent(v8::Isolate* isolate,
                                         v8::Local<v8::Object> object,
                                         v8::Local<v8::Object> custom_event) {
diff --git a/shell/browser/api/event_emitter.h b/shell/browser/api/event_emitter.h
@@ -28,6 +28,7 @@ v8::Local<v8::Object> CreateJSEvent(
     content::RenderFrameHost* sender,
     base::Optional<electron::mojom::ElectronBrowser::MessageSyncCallback>
         callback);
+v8::Local<v8::Object> CreateEmptyJSEvent(v8::Isolate* isolate);
 v8::Local<v8::Object> CreateCustomEvent(v8::Isolate* isolate,
                                         v8::Local<v8::Object> object,
                                         v8::Local<v8::Object> event);

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,8 @@ BrowserWindow.prototype._init = function () {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`// Notify the creation of the window.`
`85`		`- app.emit('browser-window-created', {}, this)`
	`85`	`+ const event = process.electronBinding('event').createEmpty()`
	`86`	`+ app.emit('browser-window-created', event, this)`
`86`	`87`
`87`	`88`	`Object.defineProperty(this, 'devToolsWebContents', {`
`88`	`89`	`enumerable: true,`
Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,8 @@ WebContents.prototype._init = function () {`
`413`	`413`	`})`
`414`	`414`	`}`
`415`	`415`
`416`		`- app.emit('web-contents-created', {}, this)`
	`416`	`+ const event = process.electronBinding('event').createEmpty()`
	`417`	`+ app.emit('web-contents-created', event, this)`
`417`	`418`	`}`
`418`	`419`
`419`	`420`	`// Deprecations`