Update to Chromium revision 939b32ee (#454471)

This commit is contained in:
Marshall Greenblatt
2017-03-03 17:37:23 -05:00
parent fe68aee82c
commit 54647945f1
127 changed files with 1874 additions and 964 deletions

View File

@@ -1,5 +1,5 @@
diff --git message_loop.cc message_loop.cc
index 2212941..c2895af 100644
index 3d55920..721aca1 100644
--- message_loop.cc
+++ message_loop.cc
@@ -96,12 +96,6 @@ MessageLoop::~MessageLoop() {
@@ -23,10 +23,10 @@ index 2212941..c2895af 100644
+ os_modal_loop_(false),
+#endif // OS_WIN
pump_factory_(pump_factory),
run_loop_(NULL),
incoming_task_queue_(new internal::IncomingTaskQueue(this)),
run_loop_(nullptr),
current_pending_task_(nullptr),
diff --git message_loop.h message_loop.h
index 91a7b1d..de864d4 100644
index 8417ce4..ee253a9 100644
--- message_loop.h
+++ message_loop.h
@@ -303,6 +303,16 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate {
@@ -46,7 +46,7 @@ index 91a7b1d..de864d4 100644
// Can only be called from the thread that owns the MessageLoop.
bool is_running() const;
@@ -440,6 +450,12 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate {
@@ -442,6 +452,12 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate {
// insider a (accidentally induced?) nested message pump.
bool nestable_tasks_allowed_;
@@ -60,7 +60,7 @@ index 91a7b1d..de864d4 100644
// if type_ is TYPE_CUSTOM and pump_ is null.
MessagePumpFactoryCallback pump_factory_;
diff --git message_pump_win.cc message_pump_win.cc
index 30638df..a50d626 100644
index d52c785..a43b5b3 100644
--- message_pump_win.cc
+++ message_pump_win.cc
@@ -366,20 +366,28 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) {