github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-31 02:08:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat: upgrade to Chromium 72.0.3626.52 (#16334)"

Browse Source 
This reverts commit 1918e76913.
This commit is contained in:
Samuel Attard
2019-01-22 12:01:04 -08:00
parent 58a6fe13d6
commit 0b85fb7ea2
178 changed files with 1734 additions and 2102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
atom/common/api/atom_api_native_image_mac.mm
View File

@@ -52,7 +52,7 @@ mate::Handle<NativeImage> NativeImage::CreateFromNamedImage(
png_data = bufferFromNSImage(
gfx::Image(gfx::ImageSkiaOperations::CreateHSLShiftedImage(
gfx_image.AsImageSkia(), shift))
.AsNSImage());
.CopyNSImage());
}
return CreateFromPNG(args->isolate(), (char*)[png_data bytes],

6
atom/common/api/atom_bindings.cc
View File

@@ -19,10 +19,10 @@
#include "atom/common/native_mate_converters/string16_converter.h"
#include "atom/common/promise_util.h"
#include "base/logging.h"
#include "base/process/process.h"
#include "base/process/process_handle.h"
#include "base/process/process_info.h"
#include "base/process/process_metrics_iocounters.h"
#include "base/system/sys_info.h"
#include "base/sys_info.h"
#include "base/threading/thread_restrictions.h"
#include "chrome/common/chrome_version.h"
#include "native_mate/dictionary.h"
@@ -189,7 +189,7 @@ v8::Local<v8::Value> AtomBindings::GetHeapStatistics(v8::Isolate* isolate) {
// static
v8::Local<v8::Value> AtomBindings::GetCreationTime(v8::Isolate* isolate) {
auto timeValue = base::Process::Current().CreationTime();
auto timeValue = base::CurrentProcessInfo::CreationTime();
if (timeValue.is_null()) {
return v8::Null(isolate);
}

2
atom/common/api/constructor.h
View File

@@ -25,7 +25,7 @@ v8::Local<v8::Function> CreateConstructor(v8::Isolate* isolate,
isolate, base::Bind(&mate::internal::InvokeNew<Sig>, func));
templ->InstanceTemplate()->SetInternalFieldCount(1);
T::BuildPrototype(isolate, templ);
return templ->GetFunction(isolate->GetCurrentContext()).ToLocalChecked();
return templ->GetFunction();
}
} // namespace mate