Update to Chromium revision ad51088c (#444943)

This commit is contained in:
Marshall Greenblatt
2017-01-23 12:36:54 -05:00
parent 9d48a4f80e
commit b7b145fa4f
117 changed files with 1261 additions and 1254 deletions

View File

@@ -1,5 +1,5 @@
diff --git message_loop.cc message_loop.cc
index 1581f6c..ecb3149 100644
index 2212941..c2895af 100644
--- message_loop.cc
+++ message_loop.cc
@@ -96,12 +96,6 @@ MessageLoop::~MessageLoop() {
@@ -26,10 +26,10 @@ index 1581f6c..ecb3149 100644
run_loop_(NULL),
incoming_task_queue_(new internal::IncomingTaskQueue(this)),
diff --git message_loop.h message_loop.h
index ac7a303..b39018b 100644
index 91a7b1d..de864d4 100644
--- message_loop.h
+++ message_loop.h
@@ -299,6 +299,16 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate {
@@ -303,6 +303,16 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate {
void AddTaskObserver(TaskObserver* task_observer);
void RemoveTaskObserver(TaskObserver* task_observer);
@@ -46,7 +46,7 @@ index ac7a303..b39018b 100644
// Can only be called from the thread that owns the MessageLoop.
bool is_running() const;
@@ -436,6 +446,12 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate {
@@ -440,6 +450,12 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate {
// insider a (accidentally induced?) nested message pump.
bool nestable_tasks_allowed_;
@@ -60,7 +60,7 @@ index ac7a303..b39018b 100644
// if type_ is TYPE_CUSTOM and pump_ is null.
MessagePumpFactoryCallback pump_factory_;
diff --git message_pump_win.cc message_pump_win.cc
index f1ec727..4b859c0 100644
index 30638df..a50d626 100644
--- message_pump_win.cc
+++ message_pump_win.cc
@@ -366,20 +366,28 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) {