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

fix signature of zoom getter apis

Browse source
This commit is contained in:
deepak1556 2017-02-16 03:44:24 +05:30
parent 5e30ccd891
commit 203a920c64
3 changed files with 32 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/browser/guest-view-manager.js
View file

@ -184,7 +184,6 @@ const attachGuest = function (event, elementInstanceId, guestInstanceId, params)
guestInstanceId: guestInstanceId,
nodeIntegration: params.nodeintegration != null ? params.nodeintegration : false,
plugins: params.plugins,
zoomFactor: embedder.getZoomFactor(),
webSecurity: !params.disablewebsecurity,
blinkFeatures: params.blinkfeatures,
disableBlinkFeatures: params.disableblinkfeatures
@ -213,15 +212,18 @@ const attachGuest = function (event, elementInstanceId, guestInstanceId, params)
return
}
webViewManager.addGuest(guestInstanceId, elementInstanceId, embedder, guest, webPreferences)
guest.attachParams = params
embedderElementsMap[key] = guestInstanceId
embedder.getZoomFactor(function (zoomFactor) {
webPreferences.zoomFactor = zoomFactor
webViewManager.addGuest(guestInstanceId, elementInstanceId, embedder, guest, webPreferences)
guest.attachParams = params
embedderElementsMap[key] = guestInstanceId
guest.setEmbedder(embedder)
guestInstance.embedder = embedder
guestInstance.elementInstanceId = elementInstanceId
guest.setEmbedder(embedder)
guestInstance.embedder = embedder
guestInstance.elementInstanceId = elementInstanceId
watchEmbedder(embedder)
watchEmbedder(embedder)
})
}
// Destroy an existing guest instance.