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

Merge pull request #5616 from electron/inherit-zoom

Browse source 
Inherit zoomFactor in webview
This commit is contained in:
Cheng Zhao 2016-05-20 00:27:06 +00:00
commit 8ac93e02c6
5 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -179,6 +179,7 @@ var attachGuest = function (embedder, elementInstanceId, guestInstanceId, params
guestInstanceId: guestInstanceId,
nodeIntegration: (ref1 = params.nodeintegration) != null ? ref1 : false,
plugins: params.plugins,
zoomFactor: params.zoomFactor,
webSecurity: !params.disablewebsecurity,
blinkFeatures: params.blinkfeatures
}

9
lib/renderer/web-view/web-view.js
View file

@ -47,8 +47,7 @@ var WebViewImpl = (function () {
WebViewImpl.prototype.createBrowserPluginNode = function () {
// We create BrowserPlugin as a custom element in order to observe changes
// to attributes synchronously.
var browserPluginNode
browserPluginNode = new WebViewImpl.BrowserPlugin()
var browserPluginNode = new WebViewImpl.BrowserPlugin()
v8Util.setHiddenValue(browserPluginNode, 'internal', this)
return browserPluginNode
}
@ -224,7 +223,8 @@ var WebViewImpl = (function () {
var attribute, attributeName, css, elementRect, params, ref1
params = {
instanceId: this.viewInstanceId,
userAgentOverride: this.userAgentOverride
userAgentOverride: this.userAgentOverride,
zoomFactor: webFrame.getZoomFactor()
}
ref1 = this.attributes
for (attributeName in ref1) {
@ -259,8 +259,7 @@ var WebViewImpl = (function () {
// Registers browser plugin <object> custom element.
var registerBrowserPluginElement = function () {
var proto
proto = Object.create(HTMLObjectElement.prototype)
var proto = Object.create(HTMLObjectElement.prototype)
proto.createdCallback = function () {
this.setAttribute('type', 'application/browser-plugin')
this.setAttribute('id', 'browser-plugin-' + getNextId())

5
spec/fixtures/pages/webview-zoom-factor.html vendored Normal file
View file

@ -0,0 +1,5 @@
<html>
<body>
<webview nodeintegration src="zoom-factor.html"/>
</body>
</html>

8
spec/fixtures/pages/zoom-factor.html vendored Normal file
View file

@ -0,0 +1,8 @@
<html>
<body>
<script type="text/javascript" charset="utf-8">
const {ipcRenderer, webFrame} = require('electron')
ipcRenderer.send('pong', webFrame.getZoomFactor(), webFrame.getZoomLevel())
</script>
</body>
</html>

15
spec/webview-spec.js
View file

@ -852,4 +852,19 @@ describe('<webview> tag', function () {
document.body.appendChild(webview)
})
})
it('inherits the zoomFactor of the parent window', function (done) {
w = new BrowserWindow({
show: false,
webPreferences: {
zoomFactor: 1.2
}
})
ipcMain.once('pong', function (event, zoomFactor, zoomLevel) {
assert.equal(zoomFactor, 1.2)
assert.equal(zoomLevel, 1)
done()
})
w.loadURL('file://' + fixtures + '/pages/webview-zoom-factor.html')
})
})