bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 149431.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@731 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-08-07 13:58:35 +00:00
parent b39ca211ae
commit 3b8ebef27b
27 changed files with 198 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cef1/libcef/cef_process.cc
View File

@ -22,8 +22,9 @@ class CefMessageLoopForUI : public MessageLoopForUI {
#if defined(OS_MACOSX)
virtual ~CefMessageLoopForUI() {
// On Mac the MessageLoop::AutoRunState scope in Run() never exits so clear
// the state_ variable to avoid an assertion in the MessageLoop destructor.
state_ = NULL;
// the run_loop_ variable to avoid an assertion in the MessageLoop
// destructor.
run_loop_ = NULL;
}
#endif
@ -43,11 +44,7 @@ class CefMessageLoopForUI : public MessageLoopForUI {
// Do a single interation of the UI message loop.
void DoMessageLoopIteration() {
#if defined(OS_MACOSX)
Run();
#else
RunWithDispatcher(NULL);
#endif
}
// Run the UI message loop.