mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 74.0.3729.0 (#638880)
- Windows: 10.0.17763.0 SDK is now required. - Mac: 10.13 SDK is now required. - Removed CefRequestContext::ResolveHostCached which is no longer supported by Chromium.
This commit is contained in:
committed by
Marshall Greenblatt
parent
58e1149c71
commit
725ed88529
@ -1,5 +1,5 @@
|
||||
diff --git base/files/file_path_watcher_linux.cc base/files/file_path_watcher_linux.cc
|
||||
index b22421d834c2..8fda7598ba4b 100644
|
||||
index 22732f2864ef..7d5caef5c3b0 100644
|
||||
--- base/files/file_path_watcher_linux.cc
|
||||
+++ base/files/file_path_watcher_linux.cc
|
||||
@@ -5,6 +5,7 @@
|
||||
@ -18,7 +18,7 @@ index b22421d834c2..8fda7598ba4b 100644
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <set>
|
||||
@@ -220,21 +222,15 @@ void InotifyReaderThreadDelegate::ThreadMain() {
|
||||
@@ -220,22 +222,15 @@ void InotifyReaderThreadDelegate::ThreadMain() {
|
||||
PlatformThread::SetName("inotify_reader");
|
||||
|
||||
// Make sure the file descriptors are good for use with select().
|
||||
@ -34,7 +34,8 @@ index b22421d834c2..8fda7598ba4b 100644
|
||||
- FD_ZERO(&rfds);
|
||||
- FD_SET(inotify_fd_, &rfds);
|
||||
-
|
||||
- ScopedBlockingCall scoped_blocking_call(BlockingType::WILL_BLOCK);
|
||||
- ScopedBlockingCall scoped_blocking_call(FROM_HERE,
|
||||
- BlockingType::WILL_BLOCK);
|
||||
-
|
||||
- // Wait until some inotify events are available.
|
||||
- int select_result =
|
||||
|
Reference in New Issue
Block a user