diff --git a/cef.gyp b/cef.gyp index aa75a450b..9a13a48fd 100644 --- a/cef.gyp +++ b/cef.gyp @@ -1041,10 +1041,6 @@ 'libcef/browser/menu_creator_runner_mac.h', 'libcef/browser/menu_creator_runner_mac.mm', # Include sources for context menu implementation. - '<(DEPTH)/chrome/browser/disposition_utils.cc', - '<(DEPTH)/chrome/browser/disposition_utils.h', - '<(DEPTH)/chrome/browser/event_disposition.cc', - '<(DEPTH)/chrome/browser/event_disposition.h', '<(DEPTH)/chrome/browser/ui/cocoa/event_utils.mm', '<(DEPTH)/chrome/browser/ui/cocoa/event_utils.h', '<(DEPTH)/chrome/browser/ui/cocoa/menu_controller.mm', diff --git a/libcef/browser/browser_context.cc b/libcef/browser/browser_context.cc index 8caf7fb34..661ba6844 100644 --- a/libcef/browser/browser_context.cc +++ b/libcef/browser/browser_context.cc @@ -199,8 +199,8 @@ class CefBrowserContext::CefResourceContext : public content::ResourceContext { }; CefBrowserContext::CefBrowserContext() - : use_osr_next_contents_view_(false), - resource_context_(new CefResourceContext) { + : resource_context_(new CefResourceContext), + use_osr_next_contents_view_(false) { } CefBrowserContext::~CefBrowserContext() { diff --git a/libcef/browser/browser_message_loop.cc b/libcef/browser/browser_message_loop.cc index 70df829a5..57846fb47 100644 --- a/libcef/browser/browser_message_loop.cc +++ b/libcef/browser/browser_message_loop.cc @@ -9,11 +9,6 @@ CefBrowserMessageLoop::CefBrowserMessageLoop() { } CefBrowserMessageLoop::~CefBrowserMessageLoop() { -#if defined(OS_MACOSX) - // On Mac the MessageLoop::AutoRunState scope in Run() never exits so clear - // the run_loop_ variable to avoid an assertion in the MessageLoop destructor. - run_loop_ = NULL; -#endif } // static diff --git a/patch/patch.cfg b/patch/patch.cfg index 57158252a..1606804e3 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -26,6 +26,11 @@ patches = [ 'name': 'zlib', 'path': '../third_party/zlib/', }, + { + # http://code.google.com/p/gyp/issues/detail?id=443 + 'name': 'message_loop_443', + 'path': '../base/', + }, { # http://code.google.com/p/chromiumembedded/issues/detail?id=451 'name': 'webkit_451', diff --git a/patch/patches/message_loop_443.patch b/patch/patches/message_loop_443.patch new file mode 100644 index 000000000..6448d9b4e --- /dev/null +++ b/patch/patches/message_loop_443.patch @@ -0,0 +1,13 @@ +Index: message_loop.cc +=================================================================== +--- message_loop.cc (revision 181864) ++++ message_loop.cc (working copy) +@@ -193,7 +193,7 @@ + MessageLoop::~MessageLoop() { + DCHECK_EQ(this, current()); + +- DCHECK(!run_loop_); ++ //DCHECK(!run_loop_); + + // Clean up any unprocessed tasks, but take care: deleting a task could + // result in the addition of more tasks (e.g., via DeleteSoon). We set a