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

fix the crash when loading site with jquery (#13476)

Browse source
This commit is contained in:
Cheng Zhao 2018-06-29 09:42:26 +09:00 • committed by GitHub
parent 7d27c91400
commit 0a3211c387
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
spec/chromium-spec.js
View file

@ -79,6 +79,20 @@ describe('chromium feature', () => {
}) })
}) })
describe('loading jquery', () => {
it('does not crash', (done) => {
w = new BrowserWindow({
show: false,
webPreferences: {
nodeIntegration: false
}
})
w.webContents.once('did-finish-load', () => { done() })
w.webContents.once('crashed', () => done(new Error('WebContents crashed.')))
w.loadURL(`file://${fixtures}/pages/jquery.html`)
})
})
describe('navigator.webkitGetUserMedia', () => { describe('navigator.webkitGetUserMedia', () => {
it('calls its callbacks', (done) => { it('calls its callbacks', (done) => {
navigator.webkitGetUserMedia({ navigator.webkitGetUserMedia({

7
spec/fixtures/pages/jquery.html vendored Normal file
View file

@ -0,0 +1,7 @@
<html>
<head>
<script src="../../static/jquery-2.0.3.min.js"></script>
</head>
<body>
</body>
</html>

2
vendor/libchromiumcontent vendored

@ -1 +1 @@
Subproject commit 2006b899d1927dd260ea0f170bdf01c2d5eda6a1 Subproject commit a604af6f51a2e816592db475159ee898f212d9db