fix: the callback of beginFrameSubscription should pass NativeImage instead of Buffer (#17548)

* Revert "revert: frame subscriber deprecation and re-enable tests"

This reverts commit f643ce4f66.

* fix: make sure SkBitmap's pixels are copied
This commit is contained in:
Cheng Zhao 2019-04-05 03:36:12 +09:00 committed by Samuel Attard
parent 77d59e99b6
commit ac30185a04
4 changed files with 25 additions and 33 deletions

View file

@ -2533,13 +2533,6 @@ describe('BrowserWindow module', () => {
})
describe('beginFrameSubscription method', () => {
before(function () {
// FIXME These specs crash on Linux when run in a docker container
if (isCI && process.platform === 'linux') {
this.skip()
}
})
it('does not crash when callback returns nothing', (done) => {
w.loadFile(path.join(fixtures, 'api', 'frame-subscriber.html'))
w.webContents.on('dom-ready', () => {
@ -2569,13 +2562,14 @@ describe('BrowserWindow module', () => {
})
})
})
it('subscribes to frame updates (only dirty rectangle)', (done) => {
let called = false
let gotInitialFullSizeFrame = false
const [contentWidth, contentHeight] = w.getContentSize()
w.webContents.on('did-finish-load', () => {
w.webContents.beginFrameSubscription(true, (data, rect) => {
if (data.length === 0) {
w.webContents.beginFrameSubscription(true, (image, rect) => {
if (image.isEmpty()) {
// Chromium sometimes sends a 0x0 frame at the beginning of the
// page load.
return
@ -2596,13 +2590,14 @@ describe('BrowserWindow module', () => {
// assert(rect.width < contentWidth || rect.height < contentHeight)
called = true
expect(data.length).to.equal(rect.width * rect.height * 4)
expect(image.getBitmap().length).to.equal(rect.width * rect.height * 4)
w.webContents.endFrameSubscription()
done()
})
})
w.loadFile(path.join(fixtures, 'api', 'frame-subscriber.html'))
})
it('throws error when subscriber is not well defined', (done) => {
w.loadFile(path.join(fixtures, 'api', 'frame-subscriber.html'))
try {