Skip to content

Commit 84a9b6a

Browse files
kevinsawickikevinsawicki
committed
Merge remote-tracking branch 'origin/master' into renaesop_master
2 parents dfcc882 + f556d19 commit 84a9b6a

File tree

336 files changed

+16696
-2410
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

336 files changed

+16696
-2410
lines changed

‎.gitignore‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/dist/
66
/external_binaries/
77
/out/
8-
/vendor/brightray/vendor/download/
8+
/vendor/download/
99
/vendor/debian_wheezy_amd64-sysroot/
1010
/vendor/debian_wheezy_arm-sysroot/
1111
/vendor/debian_wheezy_i386-sysroot/
@@ -27,3 +27,10 @@ node_modules/
2727
*.vcxproj.filters
2828
*.sln
2929
*.log
30+
/brightray/brightray.opensdf
31+
/brightray/brightray.sdf
32+
/brightray/brightray.sln
33+
/brightray/brightray.vcxproj*
34+
/brightray/brightray.suo
35+
/brightray/brightray.v12.suo
36+
/brightray/brightray.xcodeproj/

‎.gitmodules‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "vendor/brightray"]
2-
path = vendor/brightray
3-
url = https://github.com/electron/brightray.git
41
[submodule "vendor/node"]
52
path = vendor/node
63
url = https://github.com/electron/node.git
@@ -25,3 +22,9 @@
2522
[submodule "vendor/pdf_viewer"]
2623
path = vendor/pdf_viewer
2724
url = https://github.com/electron/pdf-viewer.git
25+
[submodule "vendor/gyp"]
26+
path = vendor/gyp
27+
url = https://github.com/electron/gyp
28+
[submodule "vendor/libchromiumcontent"]
29+
path = vendor/libchromiumcontent
30+
url = https://github.com/electron/libchromiumcontent

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ contains documents describing how to build and contribute to Electron.
5858
- [Ukrainian](https://github.com/electron/electron/tree/master/docs-translations/uk-UA)
5959
- [Russian](https://github.com/electron/electron/tree/master/docs-translations/ru-RU)
6060
- [French](https://github.com/electron/electron/tree/master/docs-translations/fr-FR)
61+
- [Indonesian](https://github.com/electron/electron/tree/master/docs-translations/id)
6162

6263
## Quick Start
6364

‎atom/app/atom_content_client.cc‎

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ content::PepperPluginInfo CreateWidevineCdmInfo(const base::FilePath& path,
9393
std::vector<std::string> codecs;
9494
codecs.push_back(kCdmSupportedCodecVp8);
9595
codecs.push_back(kCdmSupportedCodecVp9);
96-
#if defined(USE_PROPRIETARY_CODECS)
96+
#if BUILDFLAG(USE_PROPRIETARY_CODECS)
9797
codecs.push_back(kCdmSupportedCodecAvc1);
98-
#endif // defined(USE_PROPRIETARY_CODECS)
98+
#endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
9999
std::string codec_string = base::JoinString(
100100
codecs, std::string(1, kCdmSupportedCodecsValueDelimiter));
101101
widevine_cdm_mime_type.additional_param_names.push_back(
@@ -198,11 +198,19 @@ base::string16 AtomContentClient::GetLocalizedString(int message_id) const {
198198
return l10n_util::GetStringUTF16(message_id);
199199
}
200200

201-
void AtomContentClient::AddAdditionalSchemes(
202-
std::vector<url::SchemeWithType>* standard_schemes,
203-
std::vector<url::SchemeWithType>* referrer_schemes,
204-
std::vector<std::string>* savable_schemes) {
205-
standard_schemes->push_back({"chrome-extension", url::SCHEME_WITHOUT_PORT});
201+
void AtomContentClient::AddAdditionalSchemes(Schemes* schemes) {
202+
schemes->standard_schemes.push_back("chrome-extension");
203+
204+
std::vector<std::string> splited;
205+
ConvertStringWithSeparatorToVector(&splited, ",",
206+
switches::kRegisterServiceWorkerSchemes);
207+
for (const std::string& scheme : splited)
208+
schemes->service_worker_schemes.push_back(scheme);
209+
schemes->service_worker_schemes.push_back(url::kFileScheme);
210+
211+
ConvertStringWithSeparatorToVector(&splited, ",", switches::kSecureSchemes);
212+
for (const std::string& scheme : splited)
213+
schemes->secure_schemes.push_back(scheme);
206214
}
207215

208216
void AtomContentClient::AddPepperPlugins(
@@ -214,25 +222,4 @@ void AtomContentClient::AddPepperPlugins(
214222
ComputeBuiltInPlugins(plugins);
215223
}
216224

217-
void AtomContentClient::AddServiceWorkerSchemes(
218-
std::set<std::string>* service_worker_schemes) {
219-
std::vector<std::string> schemes;
220-
ConvertStringWithSeparatorToVector(&schemes, ",",
221-
switches::kRegisterServiceWorkerSchemes);
222-
for (const std::string& scheme : schemes)
223-
service_worker_schemes->insert(scheme);
224-
225-
service_worker_schemes->insert(url::kFileScheme);
226-
}
227-
228-
void AtomContentClient::AddSecureSchemesAndOrigins(
229-
std::set<std::string>* secure_schemes,
230-
std::set<GURL>* secure_origins) {
231-
std::vector<std::string> schemes;
232-
ConvertStringWithSeparatorToVector(&schemes, ",", switches::kSecureSchemes);
233-
for (const std::string& scheme : schemes)
234-
secure_schemes->insert(scheme);
235-
}
236-
237-
238225
} // namespace atom

‎atom/app/atom_content_client.h‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,9 @@ class AtomContentClient : public brightray::ContentClient {
2323
std::string GetProduct() const override;
2424
std::string GetUserAgent() const override;
2525
base::string16 GetLocalizedString(int message_id) const override;
26-
void AddAdditionalSchemes(
27-
std::vector<url::SchemeWithType>* standard_schemes,
28-
std::vector<url::SchemeWithType>* referrer_schemes,
29-
std::vector<std::string>* savable_schemes) override;
26+
void AddAdditionalSchemes(Schemes* schemes) override;
3027
void AddPepperPlugins(
3128
std::vector<content::PepperPluginInfo>* plugins) override;
32-
void AddServiceWorkerSchemes(
33-
std::set<std::string>* service_worker_schemes) override;
34-
void AddSecureSchemesAndOrigins(
35-
std::set<std::string>* secure_schemes,
36-
std::set<GURL>* secure_origins) override;
3729

3830
private:
3931
DISALLOW_COPY_AND_ASSIGN(AtomContentClient);

‎atom/app/node_main.cc‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
#include "atom/app/uv_task_runner.h"
88
#include "atom/browser/javascript_environment.h"
9-
#include "atom/browser/node_debugger.h"
109
#include "atom/common/api/atom_bindings.h"
1110
#include "atom/common/crash_reporter/crash_reporter.h"
1211
#include "atom/common/native_mate_converters/string16_converter.h"
@@ -51,11 +50,6 @@ int NodeMain(int argc, char *argv[]) {
5150
&isolate_data, gin_env.context(), argc, argv,
5251
exec_argc, exec_argv);
5352

54-
// Start our custom debugger implementation.
55-
NodeDebugger node_debugger(gin_env.isolate());
56-
if (node_debugger.IsRunning())
57-
env->AssignToContext(v8::Debug::GetDebugContext(gin_env.isolate()));
58-
5953
mate::Dictionary process(gin_env.isolate(), env->process_object());
6054
#if defined(OS_WIN)
6155
process.SetMethod("log", &AtomBindings::Log);

‎atom/browser/api/atom_api_app.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,8 @@ int ImportIntoCertStore(
464464

465465
if (!cert_path.empty()) {
466466
if (base::ReadFileToString(base::FilePath(cert_path), &file_data)) {
467-
auto module = model->cert_db()->GetPublicModule();
468-
rv = model->ImportFromPKCS12(module,
467+
auto module = model->cert_db()->GetPrivateSlot();
468+
rv = model->ImportFromPKCS12(module.get(),
469469
file_data,
470470
password,
471471
true,

‎atom/browser/api/atom_api_cookies.cc‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ struct Converter<net::CookieStore::ChangeCause> {
6262
switch (val) {
6363
case net::CookieStore::ChangeCause::INSERTED:
6464
case net::CookieStore::ChangeCause::EXPLICIT:
65+
case net::CookieStore::ChangeCause::EXPLICIT_DELETE_BETWEEN:
66+
case net::CookieStore::ChangeCause::EXPLICIT_DELETE_PREDICATE:
67+
case net::CookieStore::ChangeCause::EXPLICIT_DELETE_SINGLE:
68+
case net::CookieStore::ChangeCause::EXPLICIT_DELETE_CANONICAL:
6569
return mate::StringToV8(isolate, "explicit");
6670
case net::CookieStore::ChangeCause::OVERWRITE:
6771
return mate::StringToV8(isolate, "overwrite");
@@ -228,8 +232,8 @@ void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
228232
GetCookieStore(getter)->SetCookieWithDetailsAsync(
229233
GURL(url), name, value, domain, path, creation_time,
230234
expiration_time, last_access_time, secure, http_only,
231-
net::CookieSameSite::DEFAULT_MODE, false,
232-
net::COOKIE_PRIORITY_DEFAULT, base::Bind(OnSetCookie, callback));
235+
net::CookieSameSite::DEFAULT_MODE, net::COOKIE_PRIORITY_DEFAULT,
236+
base::Bind(OnSetCookie, callback));
233237
}
234238

235239
} // namespace

‎atom/browser/api/atom_api_desktop_capturer.cc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
#include "atom/browser/api/atom_api_desktop_capturer.h"
66

7+
using base::PlatformThreadRef;
8+
79
#include "atom/common/api/atom_api_native_image.h"
810
#include "atom/common/native_mate_converters/gfx_converter.h"
911
#include "base/strings/utf_string_conversions.h"

‎atom/browser/api/atom_api_protocol.cc‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,25 @@ void RegisterStandardSchemes(const std::vector<std::string>& schemes,
5050
mate::Arguments* args) {
5151
g_standard_schemes = schemes;
5252

53+
mate::Dictionary opts;
54+
bool secure = false;
55+
args->GetNext(&opts) && opts.Get("secure", &secure);
56+
57+
// Dynamically register the schemes.
5358
auto* policy = content::ChildProcessSecurityPolicy::GetInstance();
5459
for (const std::string& scheme : schemes) {
5560
url::AddStandardScheme(scheme.c_str(), url::SCHEME_WITHOUT_PORT);
61+
if (secure) {
62+
url::AddSecureScheme(scheme.c_str());
63+
}
5664
policy->RegisterWebSafeScheme(scheme);
5765
}
5866

59-
// add switches to register as standard
67+
// Add the schemes to command line switches, so child processes can also
68+
// register them.
6069
base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
6170
atom::switches::kStandardSchemes, base::JoinString(schemes, ","));
62-
63-
mate::Dictionary opts;
64-
bool secure = false;
65-
if (args->GetNext(&opts) && opts.Get("secure", &secure) && secure) {
66-
// add switches to register as secure
71+
if (secure) {
6772
base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
6873
atom::switches::kSecureSchemes, base::JoinString(schemes, ","));
6974
}

0 commit comments

Comments
 (0)