Merge pull request #544 from adobe/prashant/cef-upgrade-latest

swmitra · swmitra · commit 0894803863f3 · 2016-05-13T18:20:28.000+05:30
[CEF 2623] Upgrade to latest CEF
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -63,7 +63,7 @@ module.exports = function (grunt) {
             /* mac */
             "cef-mac": {
                 "dest"      : "<%= downloads %>",
-                "src"       : "<%= cef.url %>/cef_binary_<%= cef.version %>_macosx32.zip"
+                "src"       : "<%= cef.url %>/cef_binary_<%= cef.version %>_macosx64.zip"
             },
             "cef-mac-symbols": {
                 "src"  : "<%= cef.url %>/cef_binary_<%= cef.version %>_macosx32_release_symbols.zip",
@@ -224,7 +224,7 @@ module.exports = function (grunt) {
         },
         "cef": {
             "url"           : "http://s3.amazonaws.com/files.brackets.io/cef",
-            "version"       : "3.2171.1902"
+            "version"       : "3.2623.1397"
         },
         "node": {
             "version"       : "0.10.24"
diff --git a/appshell.gyp b/appshell.gyp
@@ -33,7 +33,7 @@
         'SDKROOT': '',
         'CLANG_CXX_LANGUAGE_STANDARD' : 'c++0x',
         'COMBINE_HIDPI_IMAGES': 'YES',
-        'ARCHS': "$(ARCHS_STANDARD_32_BIT)",
+        'ARCHS': "$(ARCHS_STANDARD_64_BIT)",
         'FRAMEWORK_SEARCH_PATHS': [
           '$(inherited)',
           '$(CONFIGURATION)'
@@ -77,6 +77,7 @@
         # Target build path.
         'SYMROOT': 'xcodebuild',
         'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',
+        'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
         'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
       },
       'conditions': [
@@ -381,6 +382,7 @@
         # Target build path.
         'SYMROOT': 'xcodebuild',
         'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',
+        'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
         'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
       },
       'conditions': [
@@ -472,6 +474,7 @@
             'OTHER_LDFLAGS': ['-Wl,-headerpad_max_install_names'],
             'SYMROOT': 'xcodebuild',
             'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',
+            'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
             'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
             'FRAMEWORK_SEARCH_PATHS': [
               '$(inherited)',
diff --git a/appshell/FullScreenButton.mm b/appshell/FullScreenButton.mm
@@ -23,15 +23,7 @@
 #import "FullScreenButton.h"
 
 //these are defined in MainMainu.xib file
-@implementation FullScreenButton {
-    NSImage *inactive;
-    NSImage *active;
-    NSImage *hover;
-    NSImage *pressed;
-    BOOL activeState;
-    BOOL hoverState;
-    BOOL pressedState;
-}
+@implementation FullScreenButton
 
 -(id)initWithCoder:(NSCoder *)aDecoder {
     self = [super initWithCoder:aDecoder];
diff --git a/appshell/TrafficLightButton.mm b/appshell/TrafficLightButton.mm
@@ -27,21 +27,7 @@
 static const int MINIMIZE_BUTTON_TAG = 1001;
 static const int ZOOM_BUTTON_TAG = 1002;
 
-@implementation TrafficLightButton {
-    NSImage *inactive;
-    NSImage *active;
-    NSImage *hover;
-    NSImage *pressed;
-    NSImage *dirtyInactive;
-    NSImage *dirtyActive;
-    NSImage *dirtyHover;
-    NSImage *dirtyPressed;
-    BOOL activeState;
-    BOOL hoverState;
-    BOOL pressedState;
-    BOOL dirtyState;
-    BOOL closeButton;
-}
+@implementation TrafficLightButton
 
 -(id)initWithCoder:(NSCoder *)aDecoder {
     self = [super initWithCoder:aDecoder];
diff --git a/appshell/cefclient_mac.mm b/appshell/cefclient_mac.mm
@@ -334,8 +334,15 @@ - (void)windowWillEnterFullScreen:(NSNotification *)notification {
     }
     if (customTitlebar) {
         [customTitlebar setHidden:YES];
+        NSWindow *window = [notification object];
+
+        // Since we have nuked the title, we will have
+        // to set the string back as we are hiding the
+        // custom title bar.
+        [window setTitle:[customTitlebar titleString]];
     }
-    
+
+
     if ([self needsFullScreenActivateHack]) {
         [NSApp activateIgnoringOtherApps:YES];
         [NSApp unhide:nil];
@@ -424,6 +431,11 @@ -(void)windowWillExitFullScreen:(NSNotification *)notification {
     //  transition from fullscreen back to normal
     if (customTitlebar) {
         [customTitlebar setHidden:NO];
+        
+        // Nuke the OS title as the title string is going to
+        // drawn by customTitleBar.
+        NSWindow *window = [notification object];
+        [window setTitle:@""];
     }
     if (trafficLightsView) {
         [trafficLightsView setHidden:NO];
@@ -601,7 +613,7 @@ - (void)createApp:(id)object {
                           NSClosableWindowMask |
                           NSMiniaturizableWindowMask |
                           NSResizableWindowMask |
-                          NSTexturedBackgroundWindowMask );
+                          NSUnifiedTitleAndToolbarWindowMask );
 
   // Get the available screen space
   NSRect screen_rect = [[NSScreen mainScreen] visibleFrame];
@@ -650,7 +662,6 @@ - (void)createApp:(id)object {
   content_rect = [mainWnd contentRectForFrameRect:[mainWnd frame]];
 
   // Configure the rest of the window
-  [mainWnd setTitle:WINDOW_TITLE];
   [mainWnd setDelegate:self.delegate];
   [mainWnd setCollectionBehavior: (1 << 7) /* NSWindowCollectionBehaviorFullScreenPrimary */];
 
diff --git a/appshell/client_colors_mac.h b/appshell/client_colors_mac.h
@@ -22,7 +22,15 @@
  */
 
 //title bar background
-static const float fillComp[4] = {0.23137255f, 0.24705882f, 0.25490196f, 1.0};
+
+#ifndef CLIENT_COLORS
+#define CLIENT_COLORS
+
+static CGFloat fillComp[4] = {0.23137255f, 0.24705882f, 0.25490196f, 1.0};
+
 //title text color
-static const float activeComp[4] = {0.77254902f, 0.77254902f, 0.77254902f, 1.0};
-static const float inactiveComp[4] = {0.50f, 0.50f, 0.50f, 1.0};
+static CGFloat activeComp[4] = {0.77254902f, 0.77254902f, 0.77254902f, 1.0};
+static CGFloat inactiveComp[4] = {0.50f, 0.50f, 0.50f, 1.0};
+
+#endif
+
diff --git a/appshell/client_handler.cpp b/appshell/client_handler.cpp
@@ -109,14 +109,16 @@ static void ParseParams(const std::string& params, CefWindowInfo& windowInfo) {
 #endif
 
 bool ClientHandler::OnBeforePopup(CefRefPtr<CefBrowser> browser,
-                             CefRefPtr<CefFrame> frame,
-                             const CefString& target_url,
-                             const CefString& target_frame_name,
-                             const CefPopupFeatures& popupFeatures,
-                             CefWindowInfo& windowInfo,
-                             CefRefPtr<CefClient>& client,
-                             CefBrowserSettings& settings,
-                             bool* no_javascript_access) {
+                           CefRefPtr<CefFrame> frame,
+                           const CefString& target_url,
+                           const CefString& target_frame_name,
+                           CefLifeSpanHandler::WindowOpenDisposition target_disposition,
+                           bool user_gesture,
+                           const CefPopupFeatures& popupFeatures,
+                           CefWindowInfo& windowInfo,
+                           CefRefPtr<CefClient>& client,
+                           CefBrowserSettings& settings,
+                           bool* no_javascript_access){
 #ifndef OS_LINUX
     std::string address = target_url.ToString();
     std::string url;
diff --git a/appshell/client_handler.h b/appshell/client_handler.h
@@ -106,15 +106,17 @@ class ClientHandler : public CefClient,
   } 
 
   // CefLifeSpanHandler methods
-  virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
-                             CefRefPtr<CefFrame> frame,
-                             const CefString& target_url,
-                             const CefString& target_frame_name,
-                             const CefPopupFeatures& popupFeatures,
-                             CefWindowInfo& windowInfo,
-                             CefRefPtr<CefClient>& client,
-                             CefBrowserSettings& settings,
-                             bool* no_javascript_access) OVERRIDE;
+virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
+                           CefRefPtr<CefFrame> frame,
+                           const CefString& target_url,
+                           const CefString& target_frame_name,
+                           CefLifeSpanHandler::WindowOpenDisposition target_disposition,
+                           bool user_gesture,
+                           const CefPopupFeatures& popupFeatures,
+                           CefWindowInfo& windowInfo,
+                           CefRefPtr<CefClient>& client,
+                           CefBrowserSettings& settings,
+                           bool* no_javascript_access) OVERRIDE;
   virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser) OVERRIDE;
   virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
   
diff --git a/appshell/client_handler_mac.mm b/appshell/client_handler_mac.mm
@@ -56,9 +56,12 @@
   NSWindow* window = [view window];
   std::string titleStr(title);
   NSString* str = [NSString stringWithUTF8String:titleStr.c_str()];
-  [window setTitle:str];
-    
+  
   NSObject* delegate = [window delegate];
+  if ([window styleMask] & NSFullScreenWindowMask) {
+      [window setTitle:str];
+  }
+
   [delegate performSelectorOnMainThread:@selector(windowTitleDidChange:) withObject:str waitUntilDone:NO];
 }
 
@@ -323,6 +326,13 @@ -(void)windowWillExitFullScreen:(NSNotification *)notification {
     //  transforms from full screen back to normal
     if (customTitlebar) {
         [customTitlebar setHidden:NO];
+
+        NSWindow *popUpWindow = [notification object];
+
+        // Since we have nuked the title, we will have
+        // to set the string back as we are hiding the
+        // custom title bar.
+        [popUpWindow setTitle:@""];
     }
     if (trafficLightsView) {
         [trafficLightsView setHidden:NO];
@@ -352,6 +362,13 @@ - (void)windowWillEnterFullScreen:(NSNotification *)notification {
     }
     if (customTitlebar) {
         [customTitlebar setHidden:YES];
+
+        NSWindow *popUpWindow = [notification object];
+
+        // Since we have nuked the title, we will have
+        // to set the string back as we are hiding the
+        // custom title bar.
+        [popUpWindow setTitle:[customTitlebar titleString]];
     }
     if ([self needsFullScreenActivateHack]) {
         // HACK  to make sure that window is activate
@@ -520,7 +537,7 @@ - (void)windowDidResignKey:(NSNotification *)notification {
     
     
     // CEF 1750 -- We need to not handle keys for the DevTools Window.
-    if (browser->GetFocusedFrame()->GetURL() == "chrome-devtools://devtools/devtools.html") {
+    if (browser->GetFocusedFrame()->GetURL() == "chrome-devtools://devtools/inspector.html") {
         return false;
     }
     
diff --git a/appshell_paths.gypi b/appshell_paths.gypi
@@ -69,10 +69,10 @@
       'include/wrapper/cef_closure_task.h',
       'include/wrapper/cef_helpers.h',
       'include/wrapper/cef_message_router.h',
+      'include/wrapper/cef_resource_manager.h',
       'include/wrapper/cef_stream_resource_handler.h',
       'include/wrapper/cef_xml_object.h',
       'include/wrapper/cef_zip_archive.h',
-
     ],
     'includes_win': [
       'include/base/internal/cef_atomicops_x86_msvc.h',
@@ -96,12 +96,15 @@
     ],
     'libcef_sources_common': [
       'libcef_dll/cpptoc/cpptoc.h',
+      'libcef_dll/ctocpp/base_ctocpp.cc',
+      'libcef_dll/ctocpp/base_ctocpp.h',
       'libcef_dll/ctocpp/ctocpp.h',
       'libcef_dll/libcef_dll.cc',
       'libcef_dll/libcef_dll2.cc',
       'libcef_dll/resource.h',
-      'libcef_dll/transfer_util.cpp',
+      'libcef_dll/transfer_util.cc',
       'libcef_dll/transfer_util.h',
+      'libcef_dll/wrapper_types.h',
       '<@(autogen_library_side)',
     ],
     'libcef_dll_wrapper_sources_common': [
@@ -117,16 +120,18 @@
       'libcef_dll/base/cef_thread_checker_impl.cc',
       'libcef_dll/base/cef_thread_collision_warner.cc',
       'libcef_dll/base/cef_weak_ptr.cc',
+      'libcef_dll/cpptoc/base_cpptoc.cc',
       'libcef_dll/cpptoc/base_cpptoc.h',
       'libcef_dll/cpptoc/cpptoc.h',
-      'libcef_dll/ctocpp/base_ctocpp.h',
       'libcef_dll/ctocpp/ctocpp.h',
-      'libcef_dll/transfer_util.cpp',
+      'libcef_dll/transfer_util.cc',
       'libcef_dll/transfer_util.h',
+      'libcef_dll/wrapper_types.h',
       'libcef_dll/wrapper/cef_browser_info_map.h',
       'libcef_dll/wrapper/cef_byte_read_handler.cc',
       'libcef_dll/wrapper/cef_closure_task.cc',
       'libcef_dll/wrapper/cef_message_router.cc',
+      'libcef_dll/wrapper/cef_resource_manager.cc',
       'libcef_dll/wrapper/cef_stream_resource_handler.cc',
       'libcef_dll/wrapper/cef_xml_object.cc',
       'libcef_dll/wrapper/cef_zip_archive.cc',
