std-vector-non-const.patch 6.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109
  1. --- a/patches/chromium/feat_add_data_parameter_to_processsingleton.patch
  2. +++ b/patches/chromium/feat_add_data_parameter_to_processsingleton.patch
  3. @@ -32,7 +32,7 @@ index 5a64220aaf1309832dc0ad543e353de67fe0a779..e75c4f0d7cf1cac2e5862eb858800359
  4. - const base::FilePath& current_directory)>;
  5. + base::RepeatingCallback<bool(const base::CommandLine& command_line,
  6. + const base::FilePath& current_directory,
  7. -+ const std::vector<const uint8_t> additional_data)>;
  8. ++ const std::vector<uint8_t> additional_data)>;
  9. #if BUILDFLAG(IS_WIN)
  10. ProcessSingleton(const std::string& program_name,
  11. @@ -72,7 +72,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768
  12. // |reader| is for sending back ACK message.
  13. void HandleMessage(const std::string& current_dir,
  14. const std::vector<std::string>& argv,
  15. -+ const std::vector<const uint8_t> additional_data,
  16. ++ const std::vector<uint8_t> additional_data,
  17. SocketReader* reader);
  18. private:
  19. @@ -83,7 +83,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768
  20. - const std::string& current_dir, const std::vector<std::string>& argv,
  21. + const std::string& current_dir,
  22. + const std::vector<std::string>& argv,
  23. -+ const std::vector<const uint8_t> additional_data,
  24. ++ const std::vector<uint8_t> additional_data,
  25. SocketReader* reader) {
  26. DCHECK(ui_task_runner_->BelongsToCurrentThread());
  27. DCHECK(reader);
  28. @@ -113,7 +113,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768
  29. + base::StringToSizeT(tokens[0], &num_args);
  30. + std::vector<std::string> command_line(tokens.begin() + 1, tokens.begin() + 1 + num_args);
  31. +
  32. -+ std::vector<const uint8_t> additional_data;
  33. ++ std::vector<uint8_t> additional_data;
  34. + if (tokens.size() >= 3 + num_args) {
  35. + size_t additional_data_size;
  36. + base::StringToSizeT(tokens[1 + num_args], &additional_data_size);
  37. @@ -122,7 +122,7 @@ index 7d3a441bdb64268ed5fbfa7bf589fb35a2fd1b75..a3e45e9baa09bfc87be5b7ff589ac768
  38. + std::string(1, kTokenDelimiter));
  39. + const uint8_t* additional_data_bits =
  40. + reinterpret_cast<const uint8_t*>(remaining_args.c_str());
  41. -+ additional_data = std::vector<const uint8_t>(
  42. ++ additional_data = std::vector<uint8_t>(
  43. + additional_data_bits, additional_data_bits + additional_data_size);
  44. + }
  45. +
  46. @@ -188,7 +188,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f
  47. base::CommandLine* parsed_command_line,
  48. - base::FilePath* current_directory) {
  49. + base::FilePath* current_directory,
  50. -+ std::vector<const uint8_t>* parsed_additional_data) {
  51. ++ std::vector<uint8_t>* parsed_additional_data) {
  52. // We should have enough room for the shortest command (min_message_size)
  53. // and also be a multiple of wchar_t bytes. The shortest command
  54. - // possible is L"START\0\0" (empty current directory and command line).
  55. @@ -229,7 +229,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f
  56. + msg.substr(fourth_null + 1, fifth_null - fourth_null);
  57. + const uint8_t* additional_data_bytes =
  58. + reinterpret_cast<const uint8_t*>(additional_data.c_str());
  59. -+ *parsed_additional_data = std::vector<const uint8_t>(additional_data_bytes,
  60. ++ *parsed_additional_data = std::vector<uint8_t>(additional_data_bytes,
  61. + additional_data_bytes + additional_data_length);
  62. +
  63. return true;
  64. @@ -240,7 +240,7 @@ index 0ea5eb3e3cf055d981ab73486115bac53287f2d7..fe68beb4b2522d27e07dbbb3341f100f
  65. base::CommandLine parsed_command_line(base::CommandLine::NO_PROGRAM);
  66. base::FilePath current_directory;
  67. - if (!ParseCommandLine(cds, &parsed_command_line, &current_directory)) {
  68. -+ std::vector<const uint8_t> additional_data;
  69. ++ std::vector<uint8_t> additional_data;
  70. + if (!ParseCommandLine(cds, &parsed_command_line, &current_directory, &additional_data)) {
  71. *result = TRUE;
  72. return true;
  73. --- a/shell/browser/api/electron_api_app.cc
  74. +++ b/shell/browser/api/electron_api_app.cc
  75. @@ -523,10 +523,10 @@ bool NotificationCallbackWrapper(
  76. const base::RepeatingCallback<
  77. void(const base::CommandLine& command_line,
  78. const base::FilePath& current_directory,
  79. - const std::vector<const uint8_t> additional_data)>& callback,
  80. + const std::vector<uint8_t> additional_data)>& callback,
  81. const base::CommandLine& cmd,
  82. const base::FilePath& cwd,
  83. - const std::vector<const uint8_t> additional_data) {
  84. + const std::vector<uint8_t> additional_data) {
  85. // Make sure the callback is called after app gets ready.
  86. if (Browser::Get()->is_ready()) {
  87. callback.Run(cmd, cwd, std::move(additional_data));
  88. @@ -1102,7 +1102,7 @@ std::string App::GetLocaleCountryCode() {
  89. void App::OnSecondInstance(const base::CommandLine& cmd,
  90. const base::FilePath& cwd,
  91. - const std::vector<const uint8_t> additional_data) {
  92. + const std::vector<uint8_t> additional_data) {
  93. v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
  94. v8::HandleScope handle_scope(isolate);
  95. v8::Local<v8::Value> data_value =
  96. --- a/shell/browser/api/electron_api_app.h
  97. +++ b/shell/browser/api/electron_api_app.h
  98. @@ -194,7 +194,7 @@ class App : public ElectronBrowserClient::Delegate,
  99. std::string GetSystemLocale(gin_helper::ErrorThrower thrower) const;
  100. void OnSecondInstance(const base::CommandLine& cmd,
  101. const base::FilePath& cwd,
  102. - const std::vector<const uint8_t> additional_data);
  103. + const std::vector<uint8_t> additional_data);
  104. bool HasSingleInstanceLock() const;
  105. bool RequestSingleInstanceLock(gin::Arguments* args);
  106. void ReleaseSingleInstanceLock();