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

use sync zoom api with guest view manager webpreferences

Browse source
This commit is contained in:
deepak1556 2017-02-16 04:03:47 +05:30
parent 763b9ab8d8
commit 71fd3e807c
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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