Skip to content

Commit 576e2c5

Browse files
authored
fix(webkit): correctly report outerWidth/Height on Mac (#3133)
1 parent 101dd3b commit 576e2c5

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

browsers.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
{
1515
"name": "webkit",
16-
"revision": "1317",
16+
"revision": "1319",
1717
"download": true
1818
}
1919
]

src/chromium/crBrowser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ export class CRBrowser extends BrowserBase {
158158

159159
if (targetInfo.type === 'page') {
160160
const opener = targetInfo.openerId ? this._crPages.get(targetInfo.openerId) || null : null;
161-
const crPage = new CRPage(session, targetInfo.targetId, context, opener, !!this._options.headful);
161+
const crPage = new CRPage(session, targetInfo.targetId, context, opener, true);
162162
this._crPages.set(targetInfo.targetId, crPage);
163163
crPage.pageOrError().then(pageOrError => {
164164
const page = crPage._page;

test/emulation.jest.js

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
const utils = require('./utils');
19-
const {FFOX, HEADLESS} = testOptions;
19+
const {CHROMIUM, FFOX, MAC, HEADLESS} = testOptions;
2020

2121
describe('BrowserContext({viewport})', function() {
2222
it('should get the proper default viewport size', async({page, server}) => {
@@ -27,6 +27,21 @@ describe('BrowserContext({viewport})', function() {
2727
await page.setViewportSize({width: 123, height: 456});
2828
await utils.verifyViewport(page, 123, 456);
2929
});
30+
// TODO: enable in Chromium after http://crrev.com/c/2321409 is landed and rolled.
31+
it.fail(CHROMIUM && HEADLESS && MAC)('should return correct outerWidth and outerHeight', async({page}) => {
32+
const size = await page.evaluate(() => {
33+
return {
34+
innerWidth: window.innerWidth,
35+
innerHeight: window.innerHeight,
36+
outerWidth: window.outerWidth,
37+
outerHeight: window.outerHeight,
38+
};
39+
});
40+
expect(size.innerWidth).toBe(1280);
41+
expect(size.innerHeight).toBe(720);
42+
expect(size.outerWidth >= size.innerWidth).toBeTruthy();
43+
expect(size.outerHeight >= size.innerHeight).toBeTruthy();
44+
});
3045
it('should emulate device width', async({page, server}) => {
3146
expect(page.viewportSize()).toEqual({width: 1280, height: 720});
3247
await page.setViewportSize({width: 200, height: 200});

0 commit comments

Comments
 (0)