Mac: Fix compile errors

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1107 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-02-23 01:46:13 +00:00
parent 6f922731b4
commit 83f568d071
5 changed files with 20 additions and 11 deletions

View File

@ -1041,10 +1041,6 @@
'libcef/browser/menu_creator_runner_mac.h', 'libcef/browser/menu_creator_runner_mac.h',
'libcef/browser/menu_creator_runner_mac.mm', 'libcef/browser/menu_creator_runner_mac.mm',
# Include sources for context menu implementation. # 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.mm',
'<(DEPTH)/chrome/browser/ui/cocoa/event_utils.h', '<(DEPTH)/chrome/browser/ui/cocoa/event_utils.h',
'<(DEPTH)/chrome/browser/ui/cocoa/menu_controller.mm', '<(DEPTH)/chrome/browser/ui/cocoa/menu_controller.mm',

View File

@ -199,8 +199,8 @@ class CefBrowserContext::CefResourceContext : public content::ResourceContext {
}; };
CefBrowserContext::CefBrowserContext() CefBrowserContext::CefBrowserContext()
: use_osr_next_contents_view_(false), : resource_context_(new CefResourceContext),
resource_context_(new CefResourceContext) { use_osr_next_contents_view_(false) {
} }
CefBrowserContext::~CefBrowserContext() { CefBrowserContext::~CefBrowserContext() {

View File

@ -9,11 +9,6 @@ CefBrowserMessageLoop::CefBrowserMessageLoop() {
} }
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 // static

View File

@ -26,6 +26,11 @@ patches = [
'name': 'zlib', 'name': 'zlib',
'path': '../third_party/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 # http://code.google.com/p/chromiumembedded/issues/detail?id=451
'name': 'webkit_451', 'name': 'webkit_451',

View File

@ -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