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

Update to Chromium version 60.0.3112.10

Browse Source
This commit is contained in:
Marshall Greenblatt
2017-06-02 22:26:54 +02:00
parent 5c79944b31
commit a2749d8fbd
13 changed files with 47 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patch/patches/service_manager_654986.patch
View File

@@ -1,5 +1,5 @@
diff --git services/service_manager/embedder/main.cc services/service_manager/embedder/main.cc
index e661492..8a282fd 100644
index e661492..b3c0296 100644
--- services/service_manager/embedder/main.cc
+++ services/service_manager/embedder/main.cc
@@ -325,13 +325,30 @@ int RunService(MainDelegate* delegate) {
@@ -95,7 +95,7 @@ index e661492..8a282fd 100644
if (tracker) {
if (exit_code == 0) {
tracker->SetProcessPhaseIfEnabled(
@@ -481,14 +494,39 @@ int Main(const MainParams& params) {
@@ -481,13 +494,38 @@ int Main(const MainParams& params) {
}
}
@@ -117,7 +117,6 @@ index e661492..8a282fd 100644
delegate->ShutDownEmbedderProcess();
+}
- return exit_code;
+int Main(MainParams& params) {
+#if defined(OS_MACOSX)
+ // We need this pool for all the objects created before we get to the event
@@ -133,10 +132,9 @@ index e661492..8a282fd 100644
+ return exit_code;
+ exit_code = MainRun(params);
+ MainShutdown(params);
+ return exit_code;
return exit_code;
}
} // namespace service_manager
diff --git services/service_manager/embedder/main.h services/service_manager/embedder/main.h
index e86697a..771acd8 100644
--- services/service_manager/embedder/main.h