Skip to content

Commit 0b85fb7

Browse files
MarshallOfSoundMarshallOfSound
committed
Revert "feat: upgrade to Chromium 72.0.3626.52 (electron#16334)"
This reverts commit 1918e76.
1 parent 58a6fe1 commit 0b85fb7

File tree

178 files changed

+1734
-2102
lines changed

Some content is hidden

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

178 files changed

+1734
-2102
lines changed

‎.circleci/config.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ step-gn-gen-default: &step-gn-gen-default
167167
step-electron-build: &step-electron-build
168168
run:
169169
name: Electron build
170-
no_output_timeout: 30m
171170
command: |
172171
cd src
173172
ninja -C out/Default electron -j18

‎BUILD.gn‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
import("build/asar.gni")
2+
import("build/npm.gni")
3+
import("buildflags/buildflags.gni")
4+
import("electron_paks.gni")
5+
import("filenames.gni")
16
import("//build/config/locales.gni")
27
import("//build/config/ui.gni")
38
import("//build/config/win/manifest.gni")
@@ -9,11 +14,6 @@ import("//tools/grit/grit_rule.gni")
914
import("//tools/grit/repack.gni")
1015
import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
1116
import("//v8/snapshot_toolchain.gni")
12-
import("build/asar.gni")
13-
import("build/npm.gni")
14-
import("buildflags/buildflags.gni")
15-
import("electron_paks.gni")
16-
import("filenames.gni")
1717

1818
if (is_mac) {
1919
import("//build/config/mac/rules.gni")
@@ -421,6 +421,7 @@ static_library("electron_lib") {
421421

422422
if (enable_osr) {
423423
sources += [
424+
"atom/browser/api/atom_api_web_contents_osr.cc",
424425
"atom/browser/osr/osr_output_device.cc",
425426
"atom/browser/osr/osr_output_device.h",
426427
"atom/browser/osr/osr_render_widget_host_view.cc",

‎DEPS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ gclient_gn_args = [
1010

1111
vars = {
1212
'chromium_version':
13-
'72.0.3626.52',
13+
'71.0.3578.98',
1414
'node_version':
15-
'ad2c89ec3be0f5db3ea02b0f591d36a5d84c51ad',
15+
'aeae08cda811ed122918bfd48fd9e56f8204d818',
1616

1717
'boto_version': 'f7574aa6cc2c819430c1f05e9a1a1a666ef8169b',
1818
'pyyaml_version': '3.12',

‎atom/app/atom_main_delegate.cc‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
#include <memory>
99
#include <string>
1010

11-
#if defined(OS_LINUX)
12-
#include <glib.h> // for g_setenv()
13-
#endif
14-
1511
#include "atom/app/atom_content_client.h"
1612
#include "atom/browser/atom_browser_client.h"
1713
#include "atom/browser/relauncher.h"
@@ -186,36 +182,6 @@ bool AtomMainDelegate::BasicStartupComplete(int* exit_code) {
186182
return false;
187183
}
188184

189-
void AtomMainDelegate::PostEarlyInitialization(bool is_running_tests) {
190-
std::string custom_locale;
191-
ui::ResourceBundle::InitSharedInstanceWithLocale(
192-
custom_locale, nullptr, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
193-
auto* cmd_line = base::CommandLine::ForCurrentProcess();
194-
if (cmd_line->HasSwitch(::switches::kLang)) {
195-
const std::string locale = cmd_line->GetSwitchValueASCII(::switches::kLang);
196-
const base::FilePath locale_file_path =
197-
ui::ResourceBundle::GetSharedInstance().GetLocaleFilePath(locale, true);
198-
if (!locale_file_path.empty()) {
199-
custom_locale = locale;
200-
#if defined(OS_LINUX)
201-
/* When built with USE_GLIB, libcc's GetApplicationLocaleInternal() uses
202-
* glib's g_get_language_names(), which keys off of getenv("LC_ALL") */
203-
g_setenv("LC_ALL", custom_locale.c_str(), TRUE);
204-
#endif
205-
}
206-
}
207-
208-
#if defined(OS_MACOSX)
209-
if (custom_locale.empty())
210-
l10n_util::OverrideLocaleWithCocoaLocale();
211-
#endif
212-
213-
LoadResourceBundle(custom_locale);
214-
215-
AtomBrowserClient::SetApplicationLocale(
216-
l10n_util::GetApplicationLocale(custom_locale));
217-
}
218-
219185
void AtomMainDelegate::PreSandboxStartup() {
220186
auto* command_line = base::CommandLine::ForCurrentProcess();
221187

‎atom/app/atom_main_delegate.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ class AtomMainDelegate : public content::ContentMainDelegate {
2525
bool BasicStartupComplete(int* exit_code) override;
2626
void PreSandboxStartup() override;
2727
void PreCreateMainMessageLoop() override;
28-
void PostEarlyInitialization(bool is_running_tests) override;
2928
content::ContentBrowserClient* CreateContentBrowserClient() override;
3029
content::ContentRendererClient* CreateContentRendererClient() override;
3130
content::ContentUtilityClient* CreateContentUtilityClient() override;

‎atom/browser/api/atom_api_app.cc‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "base/files/file_path.h"
3131
#include "base/files/file_util.h"
3232
#include "base/path_service.h"
33-
#include "base/system/sys_info.h"
33+
#include "base/sys_info.h"
3434
#include "chrome/browser/browser_process.h"
3535
#include "chrome/browser/icon_manager.h"
3636
#include "chrome/common/chrome_paths.h"
@@ -780,24 +780,24 @@ void App::OnGpuProcessCrashed(base::TerminationStatus status) {
780780

781781
void App::BrowserChildProcessLaunchedAndConnected(
782782
const content::ChildProcessData& data) {
783-
ChildProcessLaunched(data.process_type, data.GetProcess().Handle());
783+
ChildProcessLaunched(data.process_type, data.GetHandle());
784784
}
785785

786786
void App::BrowserChildProcessHostDisconnected(
787787
const content::ChildProcessData& data) {
788-
ChildProcessDisconnected(base::GetProcId(data.GetProcess().Handle()));
788+
ChildProcessDisconnected(base::GetProcId(data.GetHandle()));
789789
}
790790

791791
void App::BrowserChildProcessCrashed(
792792
const content::ChildProcessData& data,
793793
const content::ChildProcessTerminationInfo& info) {
794-
ChildProcessDisconnected(base::GetProcId(data.GetProcess().Handle()));
794+
ChildProcessDisconnected(base::GetProcId(data.GetHandle()));
795795
}
796796

797797
void App::BrowserChildProcessKilled(
798798
const content::ChildProcessData& data,
799799
const content::ChildProcessTerminationInfo& info) {
800-
ChildProcessDisconnected(base::GetProcId(data.GetProcess().Handle()));
800+
ChildProcessDisconnected(base::GetProcId(data.GetHandle()));
801801
}
802802

803803
void App::RenderProcessReady(content::RenderProcessHost* host) {
@@ -1387,9 +1387,7 @@ void Initialize(v8::Local<v8::Object> exports,
13871387
void* priv) {
13881388
v8::Isolate* isolate = context->GetIsolate();
13891389
mate::Dictionary dict(isolate, exports);
1390-
dict.Set("App", atom::api::App::GetConstructor(isolate)
1391-
->GetFunction(context)
1392-
.ToLocalChecked());
1390+
dict.Set("App", atom::api::App::GetConstructor(isolate)->GetFunction());
13931391
dict.Set("app", atom::api::App::Create(isolate));
13941392
#if defined(OS_MACOSX)
13951393
auto browser = base::Unretained(Browser::Get());

‎atom/browser/api/atom_api_auto_updater.cc‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,7 @@ void Initialize(v8::Local<v8::Object> exports,
147147
v8::Isolate* isolate = context->GetIsolate();
148148
mate::Dictionary dict(isolate, exports);
149149
dict.Set("autoUpdater", AutoUpdater::Create(isolate));
150-
dict.Set("AutoUpdater", AutoUpdater::GetConstructor(isolate)
151-
->GetFunction(context)
152-
.ToLocalChecked());
150+
dict.Set("AutoUpdater", AutoUpdater::GetConstructor(isolate)->GetFunction());
153151
}
154152

155153
} // namespace

‎atom/browser/api/atom_api_browser_view.cc‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,8 @@ void Initialize(v8::Local<v8::Object> exports,
159159
v8::Isolate* isolate = context->GetIsolate();
160160
BrowserView::SetConstructor(isolate, base::Bind(&BrowserView::New));
161161

162-
mate::Dictionary browser_view(isolate, BrowserView::GetConstructor(isolate)
163-
->GetFunction(context)
164-
.ToLocalChecked());
162+
mate::Dictionary browser_view(
163+
isolate, BrowserView::GetConstructor(isolate)->GetFunction());
165164
browser_view.SetMethod("fromId",
166165
&mate::TrackableObject<BrowserView>::FromWeakMapID);
167166
browser_view.SetMethod("getAllViews",

‎atom/browser/api/atom_api_browser_window_mac.mm‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,8 @@ - (NSView*)hitTest:(NSPoint)aPoint {
5959
// Make NativeWindow use a NSView as content view.
6060
static_cast<NativeWindowMac*>(window())->OverrideNSWindowContentView();
6161
// Add webview to contentView.
62-
NSView* webView = iwc->GetView()->GetNativeView().GetNativeNSView();
63-
NSView* contentView =
64-
[window()->GetNativeWindow().GetNativeNSWindow() contentView];
62+
NSView* webView = iwc->GetView()->GetNativeView();
63+
NSView* contentView = [window()->GetNativeWindow() contentView];
6564
[webView setFrame:[contentView bounds]];
6665

6766
// ensure that buttons view is floated to top of view hierarchy
@@ -81,7 +80,7 @@ - (NSView*)hitTest:(NSPoint)aPoint {
8180
// All ControlRegionViews should be added as children of the WebContentsView,
8281
// because WebContentsView will be removed and re-added when entering and
8382
// leaving fullscreen mode.
84-
NSView* webView = web_contents()->GetNativeView().GetNativeNSView();
83+
NSView* webView = web_contents()->GetNativeView();
8584
NSInteger webViewWidth = NSWidth([webView bounds]);
8685
NSInteger webViewHeight = NSHeight([webView bounds]);
8786

‎atom/browser/api/atom_api_debugger.cc‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,7 @@ void Initialize(v8::Local<v8::Object> exports,
194194
void* priv) {
195195
v8::Isolate* isolate = context->GetIsolate();
196196
mate::Dictionary(isolate, exports)
197-
.Set("Debugger", Debugger::GetConstructor(isolate)
198-
->GetFunction(context)
199-
.ToLocalChecked());
197+
.Set("Debugger", Debugger::GetConstructor(isolate)->GetFunction());
200198
}
201199

202200
} // namespace

0 commit comments

Comments
 (0)