From 1542dbe053cb53c3c60c5f8888496ccedad55d3c Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Sun, 3 Jul 2011 02:00:01 +0000 Subject: [PATCH] Mac: - Restore missing call to OnBeforeClose(). - Fix assertion when closing popup windows. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@264 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- libcef/browser_impl.cc | 9 +++++++++ libcef/browser_webview_delegate_mac.mm | 3 +++ 2 files changed, 12 insertions(+) diff --git a/libcef/browser_impl.cc b/libcef/browser_impl.cc index 5dd1c9959..810b895e5 100644 --- a/libcef/browser_impl.cc +++ b/libcef/browser_impl.cc @@ -700,6 +700,15 @@ void CefBrowserImpl::UIT_DestroyBrowser() } } } +#else + // Call OnBeforeClose() here for platforms that don't support modal dialogs. + if (client_.get()) { + CefRefPtr handler = client_->GetLifeSpanHandler(); + if (handler.get()) { + // Notify the handler that the window is about to be closed. + handler->OnBeforeClose(this); + } + } #endif UIT_GetWebViewDelegate()->RevokeDragDrop(); diff --git a/libcef/browser_webview_delegate_mac.mm b/libcef/browser_webview_delegate_mac.mm index deda7ccd1..3e52f42c5 100644 --- a/libcef/browser_webview_delegate_mac.mm +++ b/libcef/browser_webview_delegate_mac.mm @@ -91,6 +91,9 @@ WebRect BrowserWebViewDelegate::windowResizerRect() { if (host) { NSView *view = host->view_handle(); NSWindow* window = [view window]; + if (window == nil) + return gfx::Rect(); + resize_rect = [window _growBoxRect]; // The scrollbar assumes that the resizer goes all the way down to the // bottom corner, so we ignore any y offset to the rect itself and use the