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

Fix cfi-cast failure in CefBrowserMessageLoop::current (issue #2472)

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-07-12 10:57:06 -07:00
parent 0d12959a50
commit 7139f01103
3 changed files with 5 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libcef/browser/browser_message_loop.cc
View File

@ -7,7 +7,6 @@
#include "libcef/common/content_client.h" #include "libcef/common/content_client.h"
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
#include "base/mac/scoped_nsautorelease_pool.h" #include "base/mac/scoped_nsautorelease_pool.h"
@ -103,20 +102,3 @@ CefBrowserMessageLoop::CefBrowserMessageLoop()
} }
CefBrowserMessageLoop::~CefBrowserMessageLoop() {} CefBrowserMessageLoop::~CefBrowserMessageLoop() {}
// static
CefBrowserMessageLoop* CefBrowserMessageLoop::current() {
base::MessageLoop* loop = base::MessageLoop::current();
DCHECK(loop->IsType(base::MessageLoop::TYPE_UI));
return static_cast<CefBrowserMessageLoop*>(loop);
}
void CefBrowserMessageLoop::DoMessageLoopIteration() {
base::RunLoop run_loop;
run_loop.RunUntilIdle();
}
void CefBrowserMessageLoop::RunMessageLoop() {
base::RunLoop run_loop;
run_loop.Run();
}

9
libcef/browser/browser_message_loop.h
View File

@ -17,15 +17,6 @@ class CefBrowserMessageLoop : public base::MessageLoopForUI {
CefBrowserMessageLoop(); CefBrowserMessageLoop();
~CefBrowserMessageLoop() override; ~CefBrowserMessageLoop() override;
// Returns the CefBrowserMessageLoop of the current thread.
static CefBrowserMessageLoop* current();
// Do a single interation of the UI message loop.
void DoMessageLoopIteration();
// Run the UI message loop.
void RunMessageLoop();
private: private:
DISALLOW_COPY_AND_ASSIGN(CefBrowserMessageLoop); DISALLOW_COPY_AND_ASSIGN(CefBrowserMessageLoop);
}; };

8
libcef/browser/context.cc
View File

@ -7,7 +7,6 @@
#include "libcef/browser/browser_info.h" #include "libcef/browser/browser_info.h"
#include "libcef/browser/browser_info_manager.h" #include "libcef/browser/browser_info_manager.h"
#include "libcef/browser/browser_main.h" #include "libcef/browser/browser_main.h"
#include "libcef/browser/browser_message_loop.h"
#include "libcef/browser/chrome_browser_process_stub.h" #include "libcef/browser/chrome_browser_process_stub.h"
#include "libcef/browser/thread_util.h" #include "libcef/browser/thread_util.h"
#include "libcef/browser/trace_subscriber.h" #include "libcef/browser/trace_subscriber.h"
@ -21,6 +20,7 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/debug/debugger.h" #include "base/debug/debugger.h"
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/run_loop.h"
#include "base/synchronization/waitable_event.h" #include "base/synchronization/waitable_event.h"
#include "components/network_session_configurator/common/network_switches.h" #include "components/network_session_configurator/common/network_switches.h"
#include "content/app/content_service_manager_main_delegate.h" #include "content/app/content_service_manager_main_delegate.h"
@ -271,7 +271,8 @@ void CefDoMessageLoopWork() {
return; return;
} }
CefBrowserMessageLoop::current()->DoMessageLoopIteration(); base::RunLoop run_loop;
run_loop.RunUntilIdle();
} }
void CefRunMessageLoop() { void CefRunMessageLoop() {
@ -287,7 +288,8 @@ void CefRunMessageLoop() {
return; return;
} }
CefBrowserMessageLoop::current()->RunMessageLoop(); base::RunLoop run_loop;
run_loop.Run();
} }
void CefQuitMessageLoop() { void CefQuitMessageLoop() {