Bump v0.36.12

Fix #4733.

atom.gyp

@@ -4,7 +4,7 @@
     'product_name%': 'Electron',
     'company_name%': 'GitHub, Inc',
     'company_abbr%': 'github',
-    'version%': '0.36.11',
+    'version%': '0.36.12',
   },
   'includes': [
     'filenames.gypi',

atom/browser/resources/mac/Info.plist

@@ -17,9 +17,9 @@
   <key>CFBundleIconFile</key>
   <string>atom.icns</string>
   <key>CFBundleVersion</key>
-  <string>0.36.11</string>
+  <string>0.36.12</string>
   <key>CFBundleShortVersionString</key>
-  <string>0.36.11</string>
+  <string>0.36.12</string>
   <key>LSApplicationCategoryType</key>
   <string>public.app-category.developer-tools</string>
   <key>LSMinimumSystemVersion</key>

atom/browser/resources/win/atom.rc

@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,36,11,0
- PRODUCTVERSION 0,36,11,0
+ FILEVERSION 0,36,12,0
+ PRODUCTVERSION 0,36,12,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,12 +74,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "0.36.11"
+            VALUE "FileVersion", "0.36.12"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "0.36.11"
+            VALUE "ProductVersion", "0.36.12"
             VALUE "SquirrelAwareVersion", "1"
         END
     END

atom/common/api/object_life_monitor.cc

@@ -31,16 +31,16 @@ ObjectLifeMonitor::ObjectLifeMonitor(v8::Isolate* isolate,
 // static
 void ObjectLifeMonitor::OnObjectGC(
     const v8::WeakCallbackInfo<ObjectLifeMonitor>& data) {
-  // Usually FirstWeakCallback should do nothing other than reset |object_|
-  // and then set a second weak callback to run later. We can sidestep that,
-  // because posting a task to the current message loop is all but free - but
-  // DO NOT add any more work to this method. The only acceptable place to add
-  // code is RunCallback.
   ObjectLifeMonitor* self = data.GetParameter();
   self->target_.Reset();
-  base::MessageLoop::current()->PostTask(
-      FROM_HERE, base::Bind(&ObjectLifeMonitor::RunCallback,
-                            self->weak_ptr_factory_.GetWeakPtr()));
+  self->RunCallback();
+  data.SetSecondPassCallback(Free);
+}
+
+// static
+void ObjectLifeMonitor::Free(
+    const v8::WeakCallbackInfo<ObjectLifeMonitor>& data) {
+  delete data.GetParameter();
 }
 
 void ObjectLifeMonitor::RunCallback() {
@@ -50,7 +50,6 @@ void ObjectLifeMonitor::RunCallback() {
   v8::Context::Scope context_scope(context);
   v8::Local<v8::Function>::New(isolate_, destructor_)->Call(
       context->Global(), 0, nullptr);
-  delete this;
 }
 
 }  // namespace atom

atom/common/api/object_life_monitor.h

@@ -23,6 +23,7 @@ class ObjectLifeMonitor {
                     v8::Local<v8::Function> destructor);
 
   static void OnObjectGC(const v8::WeakCallbackInfo<ObjectLifeMonitor>& data);
+  static void Free(const v8::WeakCallbackInfo<ObjectLifeMonitor>& data);
 
   void RunCallback();
 

atom/common/atom_version.h

@@ -7,7 +7,7 @@
 
 #define ATOM_MAJOR_VERSION 0
 #define ATOM_MINOR_VERSION 36
-#define ATOM_PATCH_VERSION 11
+#define ATOM_PATCH_VERSION 12
 
 #define ATOM_VERSION_IS_RELEASE 1
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "0.36.11",
+  "version": "0.36.12",
   "devDependencies": {
     "asar": "^0.10.0",
     "eslint": "^2.1.0",