Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use flexbox layout for browserplugin #4665

Merged
merged 1 commit into from Mar 6, 2016
Merged

Use flexbox layout for browserplugin #4665

merged 1 commit into from Mar 6, 2016

Conversation

christoth
Copy link
Contributor

Fix for #4664, using flexbox layout within webview. This approach for the browerplugin layout will work when the containing webview uses both flexbox and traditional (display: block) layout.

@christoth
Copy link
Contributor Author

@zcbenz - not sure why the "chromium feature navigator.serviceWorker should register for file scheme" test is timing out for a webview related change?
Any guidance would be appreciated. Thanks

@zcbenz
Copy link
Member

zcbenz commented Mar 6, 2016

Honestly I don't know whether it would have side effects, but let's merge this. 👍

not sure why the "chromium feature navigator.serviceWorker should register for file scheme" test is timing out for a webview related change?

That test is a bit flaky.

zcbenz added a commit that referenced this pull request Mar 6, 2016
@zcbenz zcbenz merged commit e152b88 into electron:master Mar 6, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants