aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-content_app_content__main__runner.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-content_app_content__main__runner.cc')
-rw-r--r--www/chromium/files/patch-content_app_content__main__runner.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-content_app_content__main__runner.cc b/www/chromium/files/patch-content_app_content__main__runner.cc
index 6cb01e35ea4e..6d9bb3e8dfa9 100644
--- a/www/chromium/files/patch-content_app_content__main__runner.cc
+++ b/www/chromium/files/patch-content_app_content__main__runner.cc
@@ -1,6 +1,6 @@
---- content/app/content_main_runner.cc.orig 2017-04-19 19:06:33 UTC
+--- content/app/content_main_runner.cc.orig 2017-06-05 19:03:06 UTC
+++ content/app/content_main_runner.cc
-@@ -92,10 +92,10 @@
+@@ -86,10 +86,10 @@
#include "base/posix/global_descriptors.h"
#include "content/public/common/content_descriptors.h"
@@ -13,7 +13,7 @@
#include "content/zygote/zygote_main.h"
#endif
-@@ -365,7 +365,7 @@ struct MainFunction {
+@@ -312,7 +312,7 @@ struct MainFunction {
int (*function)(const MainFunctionParams&);
};
@@ -22,7 +22,7 @@
// On platforms that use the zygote, we have a special subset of
// subprocesses that are launched via the zygote. This function
// fills in some process-launching bits around ZygoteMain().
-@@ -426,7 +426,7 @@ int RunZygote(const MainFunctionParams&
+@@ -373,7 +373,7 @@ int RunZygote(const MainFunctionParams& main_function_
NOTREACHED() << "Unknown zygote process type: " << process_type;
return 1;
}
@@ -31,7 +31,7 @@
static void RegisterMainThreadFactories() {
#if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD)
-@@ -492,7 +492,7 @@ int RunNamedProcessTypeMain(
+@@ -439,7 +439,7 @@ int RunNamedProcessTypeMain(
}
}