mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 74.0.3706.0 (#632463)
This commit is contained in:
@ -1,8 +1,19 @@
|
||||
diff --git base/message_loop/message_loop.cc base/message_loop/message_loop.cc
|
||||
index f72f17d9317c..40c421ad4dcb 100644
|
||||
index cec3a133889d..4b25f540a4af 100644
|
||||
--- base/message_loop/message_loop.cc
|
||||
+++ base/message_loop/message_loop.cc
|
||||
@@ -177,6 +177,9 @@ MessageLoopBase* MessageLoop::GetMessageLoopBase() {
|
||||
@@ -151,6 +151,10 @@ void MessageLoop::RemoveTaskObserver(TaskObserver* task_observer) {
|
||||
}
|
||||
|
||||
bool MessageLoop::IsBoundToCurrentThread() const {
|
||||
+ if (!pump_) {
|
||||
+ // Avoid DCHECKs in the MessageLoop destructor after we call ReleasePump().
|
||||
+ return false;
|
||||
+ }
|
||||
return backend_->IsBoundToCurrentThread();
|
||||
}
|
||||
|
||||
@@ -164,6 +168,9 @@ MessageLoopBase* MessageLoop::GetMessageLoopBase() {
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
@ -13,10 +24,10 @@ index f72f17d9317c..40c421ad4dcb 100644
|
||||
std::unique_ptr<MessageLoop> MessageLoop::CreateUnbound(
|
||||
Type type,
|
||||
diff --git base/message_loop/message_loop.h base/message_loop/message_loop.h
|
||||
index 1adfd4cd1904..acfc0886003c 100644
|
||||
index f49f56285de7..159e645a0c9f 100644
|
||||
--- base/message_loop/message_loop.h
|
||||
+++ base/message_loop/message_loop.h
|
||||
@@ -188,6 +188,8 @@ class BASE_EXPORT MessageLoopBase {
|
||||
@@ -185,6 +185,8 @@ class BASE_EXPORT MessageLoopBase {
|
||||
// can post other tasks when destructed.
|
||||
virtual void DeletePendingTasks() = 0;
|
||||
|
||||
@ -25,9 +36,9 @@ index 1adfd4cd1904..acfc0886003c 100644
|
||||
protected:
|
||||
friend class MessageLoop;
|
||||
friend class MessageLoopForUI;
|
||||
@@ -294,6 +296,9 @@ class BASE_EXPORT MessageLoop {
|
||||
SEQUENCE_MANAGER,
|
||||
};
|
||||
@@ -286,6 +288,9 @@ class BASE_EXPORT MessageLoop {
|
||||
|
||||
MessageLoopBase* GetMessageLoopBase();
|
||||
|
||||
+ // Called from Thread::CleanUp() to release resources.
|
||||
+ void ReleasePump() { pump_ = nullptr; backend_->ReleasePump(); }
|
||||
@ -35,7 +46,7 @@ index 1adfd4cd1904..acfc0886003c 100644
|
||||
//----------------------------------------------------------------------------
|
||||
protected:
|
||||
using MessagePumpFactoryCallback =
|
||||
@@ -402,6 +407,7 @@ class BASE_EXPORT MessageLoop {
|
||||
@@ -374,6 +379,7 @@ class BASE_EXPORT MessageLoop {
|
||||
class BASE_EXPORT MessageLoopForUI : public MessageLoop {
|
||||
public:
|
||||
explicit MessageLoopForUI(Type type = TYPE_UI);
|
||||
@ -44,7 +55,7 @@ index 1adfd4cd1904..acfc0886003c 100644
|
||||
#if defined(OS_IOS)
|
||||
// On iOS, the main message loop cannot be Run(). Instead call Attach(),
|
||||
diff --git base/message_loop/message_loop_current.cc base/message_loop/message_loop_current.cc
|
||||
index dca465455e36..bc2dc7c33110 100644
|
||||
index e669669c72f5..84cc1bee2c74 100644
|
||||
--- base/message_loop/message_loop_current.cc
|
||||
+++ base/message_loop/message_loop_current.cc
|
||||
@@ -49,6 +49,8 @@ void MessageLoopCurrent::AddDestructionObserver(
|
||||
@ -57,7 +68,7 @@ index dca465455e36..bc2dc7c33110 100644
|
||||
current_->RemoveDestructionObserver(destruction_observer);
|
||||
}
|
||||
diff --git base/message_loop/message_loop_current.h base/message_loop/message_loop_current.h
|
||||
index 56c147d1e739..4afd37ba5b10 100644
|
||||
index d469a7214001..76ae4cb77c8e 100644
|
||||
--- base/message_loop/message_loop_current.h
|
||||
+++ base/message_loop/message_loop_current.h
|
||||
@@ -134,6 +134,16 @@ class BASE_EXPORT MessageLoopCurrent {
|
||||
@ -107,32 +118,19 @@ index 56c147d1e739..4afd37ba5b10 100644
|
||||
};
|
||||
|
||||
#if !defined(OS_NACL)
|
||||
diff --git base/message_loop/message_loop_impl.h base/message_loop/message_loop_impl.h
|
||||
index bfcdf0c9694b..d0009f6a88d0 100644
|
||||
--- base/message_loop/message_loop_impl.h
|
||||
+++ base/message_loop/message_loop_impl.h
|
||||
@@ -78,6 +78,8 @@ class BASE_EXPORT MessageLoopImpl : public MessageLoopBase,
|
||||
void DeletePendingTasks() override;
|
||||
bool HasTasks() override;
|
||||
|
||||
+ void ReleasePump() override { pump_ = nullptr; }
|
||||
+
|
||||
// Gets the TaskRunner associated with this message loop.
|
||||
const scoped_refptr<SingleThreadTaskRunner>& task_runner() const {
|
||||
return task_runner_;
|
||||
diff --git base/message_loop/message_pump_win.cc base/message_loop/message_pump_win.cc
|
||||
index 5d917056f2e2..4aee732f1b71 100644
|
||||
index 9de7721c9cfb..13b9bf8660ed 100644
|
||||
--- base/message_loop/message_pump_win.cc
|
||||
+++ base/message_loop/message_pump_win.cc
|
||||
@@ -11,6 +11,7 @@
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
#include "base/bind.h"
|
||||
#include "base/debug/alias.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
+#include "base/message_loop/message_loop_current.h"
|
||||
#include "base/metrics/histogram_macros.h"
|
||||
#include "base/strings/stringprintf.h"
|
||||
#include "base/trace_event/trace_event.h"
|
||||
@@ -385,20 +386,28 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) {
|
||||
@@ -390,20 +391,28 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) {
|
||||
}
|
||||
|
||||
bool MessagePumpForUI::ProcessPumpReplacementMessage() {
|
||||
@ -174,15 +172,15 @@ index 5d917056f2e2..4aee732f1b71 100644
|
||||
msg.hwnd != message_window_.hwnd());
|
||||
|
||||
diff --git base/task/sequence_manager/sequence_manager_impl.h base/task/sequence_manager/sequence_manager_impl.h
|
||||
index e3838c1b33bd..ded869d57924 100644
|
||||
index 6c5c85f0e62f..78d400e609dc 100644
|
||||
--- base/task/sequence_manager/sequence_manager_impl.h
|
||||
+++ base/task/sequence_manager/sequence_manager_impl.h
|
||||
@@ -165,6 +165,8 @@ class BASE_EXPORT SequenceManagerImpl
|
||||
@@ -155,6 +155,8 @@ class BASE_EXPORT SequenceManagerImpl
|
||||
void BindToCurrentThread(std::unique_ptr<MessagePump> pump) override;
|
||||
void DeletePendingTasks() override;
|
||||
bool HasTasks() override;
|
||||
+
|
||||
+ void ReleasePump() override { }
|
||||
+ void ReleasePump() override {}
|
||||
|
||||
// Requests that a task to process work is posted on the main task runner.
|
||||
// These tasks are de-duplicated in two buckets: main-thread and all other
|
||||
// Requests that a task to process work is scheduled.
|
||||
void ScheduleWork();
|
||||
|
Reference in New Issue
Block a user