Attachment 182513 Details for Bug 219188 – patch

[patch] patch

chromium-headless.diff (text/plain), 9.97 KB, created by Carlos J. Puga Medina on 2017-05-11 14:07:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J. Puga Medina

Created: 2017-05-11 14:07:22 UTC

Size: 9.97 KB

patch

obsolete

>Index: www/chromium/files/patch-chrome_app_chrome__main.cc
>===================================================================
>--- www/chromium/files/patch-chrome_app_chrome__main.cc	(nonexistent)
>+++ www/chromium/files/patch-chrome_app_chrome__main.cc	(working copy)
>@@ -0,0 +1,19 @@
>+--- chrome/app/chrome_main.cc.orig	2017-05-09 19:02:41 UTC
>++++ chrome/app/chrome_main.cc
>+@@ -97,14 +97,14 @@ int ChromeMain(int argc, const char** ar
>+   ALLOW_UNUSED_LOCAL(command_line);
>+ #endif
>+ 
>+-#if defined(OS_LINUX) || defined(OS_MACOSX)
>++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
>+   if (command_line->HasSwitch(switches::kHeadless)) {
>+ #if defined(OS_MACOSX)
>+     SetUpBundleOverrides();
>+ #endif
>+     return headless::HeadlessShellMain(argc, argv);
>+   }
>+-#endif  // defined(OS_LINUX) || defined(OS_MACOSX)
>++#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
>+ 
>+ #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
>+   version_info::Channel channel = chrome::GetChannel();
>
>Property changes on: www/chromium/files/patch-chrome_app_chrome__main.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/chromium/files/patch-chrome_chrome__paks.gni
>===================================================================
>--- www/chromium/files/patch-chrome_chrome__paks.gni	(nonexistent)
>+++ www/chromium/files/patch-chrome_chrome__paks.gni	(working copy)
>@@ -0,0 +1,11 @@
>+--- chrome/chrome_paks.gni.orig	2017-05-09 19:02:43 UTC
>++++ chrome/chrome_paks.gni
>+@@ -157,7 +157,7 @@ template("chrome_extra_paks") {
>+         "//ui/file_manager:resources",
>+       ]
>+     }
>+-    if (is_linux) {
>++    if (is_linux || is_bsd) {
>+       sources += [ "$root_gen_dir/headless/headless_lib_resources.pak" ]
>+       deps += [ "//headless:resources" ]
>+     }
>
>Property changes on: www/chromium/files/patch-chrome_chrome__paks.gni
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc
>===================================================================
>--- www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc	(nonexistent)
>+++ www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc	(working copy)
>@@ -0,0 +1,20 @@
>+--- headless/lib/browser/headless_content_browser_client.cc.orig	2017-05-09 19:02:47 UTC
>++++ headless/lib/browser/headless_content_browser_client.cc
>+@@ -171,7 +171,7 @@ void HeadlessContentBrowserClient::GetQu
>+       callback);
>+ }
>+ 
>+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
>++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
>+ void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
>+     const base::CommandLine& command_line,
>+     int child_process_id,
>+@@ -182,7 +182,7 @@ void HeadlessContentBrowserClient::GetAd
>+     mappings->Share(kCrashDumpSignal, crash_signal_fd);
>+ #endif  // defined(HEADLESS_USE_BREAKPAD)
>+ }
>+-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
>++#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
>+ 
>+ void HeadlessContentBrowserClient::AppendExtraCommandLineSwitches(
>+     base::CommandLine* command_line,
>
>Property changes on: www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h
>===================================================================
>--- www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h	(nonexistent)
>+++ www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- headless/lib/browser/headless_content_browser_client.h.orig	2017-05-09 19:02:47 UTC
>++++ headless/lib/browser/headless_content_browser_client.h
>+@@ -28,7 +28,7 @@ class HeadlessContentBrowserClient : pub
>+       content::BrowserContext* context,
>+       content::StoragePartition* partition,
>+       const storage::OptionalQuotaSettingsCallback& callback) override;
>+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
>++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
>+   void GetAdditionalMappedFilesForChildProcess(
>+       const base::CommandLine& command_line,
>+       int child_process_id,
>
>Property changes on: www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
>===================================================================
>--- www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc	(nonexistent)
>+++ www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc	(working copy)
>@@ -0,0 +1,38 @@
>+--- headless/lib/headless_content_main_delegate.cc.orig	2017-05-09 19:02:47 UTC
>++++ headless/lib/headless_content_main_delegate.cc
>+@@ -147,7 +147,7 @@ void HeadlessContentMainDelegate::InitCr
>+   g_headless_crash_client.Pointer()->set_crash_dumps_dir(
>+       browser_->options()->crash_dumps_dir);
>+ 
>+-#if !defined(OS_MACOSX)
>++#if !defined(OS_MACOSX) && !defined(OS_BSD)
>+   if (!browser_->options()->enable_crash_reporter) {
>+     DCHECK(!breakpad::IsCrashReporterEnabled());
>+     return;
>+@@ -156,7 +156,7 @@ void HeadlessContentMainDelegate::InitCr
>+   if (process_type != switches::kZygoteProcess)
>+     breakpad::InitCrashReporter(process_type);
>+ #endif  // defined(HEADLESS_USE_BREAKPAD)
>+-#endif  // !defined(OS_MACOSX)
>++#endif  // !defined(OS_MACOSX) && !defined(OS_BSD)
>+ }
>+ 
>+ void HeadlessContentMainDelegate::PreSandboxStartup() {
>+@@ -170,7 +170,7 @@ void HeadlessContentMainDelegate::PreSan
>+   if (command_line.HasSwitch(switches::kEnableLogging))
>+     InitLogging(command_line);
>+ #endif
>+-#if !defined(OS_MACOSX)
>++#if !defined(OS_MACOSX) && !defined(OS_BSD)
>+   InitCrashReporter(command_line);
>+ #endif
>+   InitializeResourceBundle();
>+@@ -202,7 +202,7 @@ int HeadlessContentMainDelegate::RunProc
>+   return 0;
>+ }
>+ 
>+-#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID)
>++#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
>+ void HeadlessContentMainDelegate::ZygoteForked() {
>+   const base::CommandLine& command_line(
>+       *base::CommandLine::ForCurrentProcess());
>
>Property changes on: www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/chromium/files/patch-headless_lib_headless__content__main__delegate.h
>===================================================================
>--- www/chromium/files/patch-headless_lib_headless__content__main__delegate.h	(nonexistent)
>+++ www/chromium/files/patch-headless_lib_headless__content__main__delegate.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- headless/lib/headless_content_main_delegate.h.orig	2017-05-09 19:02:47 UTC
>++++ headless/lib/headless_content_main_delegate.h
>+@@ -39,7 +39,7 @@ class HeadlessContentMainDelegate : publ
>+ 
>+   HeadlessBrowserImpl* browser() const { return browser_.get(); }
>+ 
>+-#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID)
>++#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
>+   void ZygoteForked() override;
>+ #endif
>+ 
>
>Property changes on: www/chromium/files/patch-headless_lib_headless__content__main__delegate.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/chromium/files/patch-headless_lib_headless__macros.h
>===================================================================
>--- www/chromium/files/patch-headless_lib_headless__macros.h	(nonexistent)
>+++ www/chromium/files/patch-headless_lib_headless__macros.h	(working copy)
>@@ -0,0 +1,13 @@
>+--- headless/lib/headless_macros.h.orig	2017-05-09 19:02:47 UTC
>++++ headless/lib/headless_macros.h
>+@@ -5,8 +5,8 @@
>+ #ifndef HEADLESS_LIB_HEADLESS_MACROS_H_
>+ #define HEADLESS_LIB_HEADLESS_MACROS_H_
>+ 
>+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
>++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
>+ #define HEADLESS_USE_BREAKPAD
>+-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
>++#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
>+ 
>+ #endif  // HEADLESS_LIB_HEADLESS_MACROS_H_
>
>Property changes on: www/chromium/files/patch-headless_lib_headless__macros.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 219188: 182480 | 182513