Moving to release branch for Brackets 1.12

Gruntfile.js

@@ -38,7 +38,7 @@ module.exports = function (grunt) {
     }
 
     if (platform === "linux") {
-        cef_version = "3.2704.1414";
+        cef_version = "3.2785.1486";
     }
 
     grunt.initConfig({

appshell/appshell_extensions.js

@@ -942,5 +942,8 @@ if (!appshell.app) {
 
 
     // Alias the appshell object to brackets. This is temporary and should be removed.
-    brackets = appshell;
+    // The following is now moved to Global.js as newer versions of CEF crash upon
+    // eval of this statement.
+    //brackets = appshell;
+
 })();

appshell/browser/root_window_gtk.cc

@@ -360,13 +360,46 @@ void RootWindowGtk::CreateRootWindow(const CefBrowserSettings& settings) {
   }
 }
 
+// The following function makes sure we repaginate
+// the content once the window is shown first. The
+// problem was that the view port was not getting
+// updated and a fake resize was required for the
+// content to repaginate.
+void DelayedResize(GtkWidget* window_) {
+  if(window_){
+      GtkWindow* window = GTK_WINDOW(window_);
+      GdkWindow* gdk_window = gtk_widget_get_window(window_);
+
+      gint x;
+      gint y;
+      gint width;
+      gint height;
+      gint depth;
+
+      gdk_window_get_geometry (gdk_window,
+                          &x,
+                          &y,
+                          &width,
+                          &height,
+                          &depth);
+
+      // A hack to repaginate the content inside the window.
+      // Nudge the width and height by one pixel, so that the
+      // resize is not noticeable.
+      gdk_window_resize (gdk_window, width + 1, height + 1);
+  }
+}
+
 void RootWindowGtk::OnBrowserCreated(CefRefPtr<CefBrowser> browser) {
   REQUIRE_MAIN_THREAD();
 
   // For popup browsers create the root window once the browser has been
   // created.
   if (is_popup_)
     CreateRootWindow(CefBrowserSettings());
+
+  // Post a message to CEF queue for delated resize.
+  CefPostTask(TID_UI, base::Bind(&DelayedResize, window_));
 }
 
 void RootWindowGtk::OnBrowserWindowDestroyed() {

appshell/client_handler.cpp

@@ -202,7 +202,11 @@ bool ClientHandler::OnDragEnter(CefRefPtr<CefBrowser> browser,
 }
 
 void ClientHandler::OnLoadStart(CefRefPtr<CefBrowser> browser,
-                                CefRefPtr<CefFrame> frame) {
+                                CefRefPtr<CefFrame> frame
+                                #ifdef OS_LINUX
+                                  ,TransitionType transition_type
+                                #endif
+                                ) {
   CEF_REQUIRE_UI_THREAD();
 
   if (m_BrowserId == browser->GetIdentifier() && frame->IsMain()) {

appshell/client_handler.h

@@ -126,7 +126,11 @@ virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
 
   // CefLoadHandler methods
   virtual void OnLoadStart(CefRefPtr<CefBrowser> browser,
-                           CefRefPtr<CefFrame> frame) OVERRIDE;
+                           CefRefPtr<CefFrame> frame
+                    #ifdef OS_LINUX
+                           ,TransitionType transition_type
+                    #endif
+                           ) OVERRIDE;
   virtual void OnLoadEnd(CefRefPtr<CefBrowser> browser,
                          CefRefPtr<CefFrame> frame,
                          int httpStatusCode) OVERRIDE;

appshell/mac/Info.plist

@@ -19,9 +19,9 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.11.0</string>
+	<string>1.12.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.11.0</string>
+	<string>1.12.0</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

appshell/version.rc

@@ -31,7 +31,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    	1,11,0,0
+FILEVERSION    	1,12,0,0
 /* PRODUCTVERSION 	1,0,0,0 */
 FILEOS         	VOS__WINDOWS32
 FILETYPE       	VFT_APP
@@ -42,7 +42,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName",      "brackets.io\0"
             VALUE "FileDescription",  "\0"
-            VALUE "FileVersion",      "Release 1.11.0\0"
+            VALUE "FileVersion",      "Release 1.12.0\0"
             VALUE "ProductName",      APP_NAME "\0"
             VALUE "ProductVersion",   "\0"
             VALUE "LegalCopyright",   "(c) 2012 Adobe Systems, Inc.\0"

appshell/version_linux.h

@@ -1 +1 @@
-#define APP_VERSION "1.11.0.0"
+#define APP_VERSION "1.12.0.0"

installer/mac/buildInstaller.sh

@@ -2,7 +2,7 @@
 
 # config
 releaseName="Brackets"
-version="1.11"
+version="1.12"
 dmgName="${releaseName} Release ${version}"
 format="bzip2"
 encryption="none"

installer/win/brackets-win-install-build.xml

@@ -12,7 +12,7 @@ default="build.mul">
   <!-- See also: product name definitions in Brackets_<locale>.wxl -->
   <property name="product.shortname" value="Brackets"/>
   <property name="product.release.number.major" value="1"/>
-  <property name="product.release.number.minor" value="11"/>
+  <property name="product.release.number.minor" value="12"/>
   <property name="product.version.number" value="${product.release.number.major}.${product.release.number.minor}"/>
   <property name="product.version.name" value="Release ${product.version.number}"/>
   <property name="product.fullname" value="Brackets ${product.version.name}"/>

package.json

@@ -1,6 +1,6 @@
 {
     "name": "Brackets-Shell",
-    "version": "1.11.0-0",
+    "version": "1.12.0-0",
     "homepage": "http://brackets.io",
     "issues": {
         "url": "http://github.com/adobe/brackets-shell/issues"