mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

vendor: Update native mate to fix v8 DCHECK crash (#12534)

Browse source 
* update native_mate ref

* Remove MarkHighMemoryUsage api
This commit is contained in:
Robo 2018-04-05 11:17:18 +05:30 • committed by Charles Kerr
parent c75dd93b92
commit c1404ff2c1
3 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_web_contents.cc
View file

@ -332,10 +332,6 @@ WebContents::WebContents(v8::Isolate* isolate, const mate::Dictionary& options)
request_id_(0), request_id_(0),
background_throttling_(true), background_throttling_(true),
enable_devtools_(true) { enable_devtools_(true) {
// WebContents may need to emit events when it is garbage collected, so it
// has to be deleted in the first gc callback.
MarkHighMemoryUsage();
// Read options. // Read options.
options.Get("backgroundThrottling", &background_throttling_); options.Get("backgroundThrottling", &background_throttling_);

2
atom/common/api/atom_api_native_image.cc
View file

@ -223,7 +223,6 @@ NativeImage::NativeImage(v8::Isolate* isolate, const gfx::Image& image)
isolate->AdjustAmountOfExternalAllocatedMemory( isolate->AdjustAmountOfExternalAllocatedMemory(
image_.ToImageSkia()->bitmap()->computeByteSize()); image_.ToImageSkia()->bitmap()->computeByteSize());
} }
MarkHighMemoryUsage();
} }
#if defined(OS_WIN) #if defined(OS_WIN)
@ -238,7 +237,6 @@ NativeImage::NativeImage(v8::Isolate* isolate, const base::FilePath& hicon_path)
isolate->AdjustAmountOfExternalAllocatedMemory( isolate->AdjustAmountOfExternalAllocatedMemory(
image_.ToImageSkia()->bitmap()->computeByteSize()); image_.ToImageSkia()->bitmap()->computeByteSize());
} }
MarkHighMemoryUsage();
} }
#endif #endif

2
vendor/native_mate vendored

@ -1 +1 @@
Subproject commit 99d9e262eb36cb9dc8e83f61e026d2a7ad1e96ab Subproject commit 02693839ca2570a5f14b4270573c91cbf1bd9b1d