Merge lp://qastaging/~abreu-alexandre/webbrowser-app/local-webapp-popups-in-container into lp://qastaging/webbrowser-app
Proposed by
Alexandre Abreu
Status: | Work in progress |
---|---|
Proposed branch: | lp://qastaging/~abreu-alexandre/webbrowser-app/local-webapp-popups-in-container |
Merge into: | lp://qastaging/webbrowser-app |
Diff against target: |
319 lines (+153/-14) 10 files modified
src/app/webcontainer/CMakeLists.txt (+1/-0) src/app/webcontainer/WebApp.qml (+1/-0) src/app/webcontainer/WebViewImplOxide.qml (+31/-12) src/app/webcontainer/WebViewImplWebkit.qml (+1/-0) src/app/webcontainer/WebappContainerWebview.qml (+3/-1) src/app/webcontainer/webapp-container-helper.cpp (+52/-0) src/app/webcontainer/webapp-container-helper.h (+43/-0) src/app/webcontainer/webapp-container.cpp (+13/-1) src/app/webcontainer/webapp-container.h (+5/-0) src/app/webcontainer/webapp-container.qml (+3/-0) |
To merge this branch: | bzr merge lp://qastaging/~abreu-alexandre/webbrowser-app/local-webapp-popups-in-container |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+222641@code.qastaging.launchpad.net |
Commit message
Open popups in same container instead of dispatching to webbrowser-app
Description of the change
Open popups in same container instead of dispatching to webbrowser-app
To post a comment you must log in.
Unmerged revisions
- 569. By Alexandre Abreu
-
redirect popups corresponding to the webapp locally in the current container
FAILED: Continuous integration, rev:564 jenkins. qa.ubuntu. com/job/ webbrowser- app-ci/ 865/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/786/ console jenkins. qa.ubuntu. com/job/ generic- mediumtests- utopic/ 722/console jenkins. qa.ubuntu. com/job/ webbrowser- app-utopic- amd64-ci/ 64/console jenkins. qa.ubuntu. com/job/ webbrowser- app-utopic- armhf-ci/ 64/console jenkins. qa.ubuntu. com/job/ webbrowser- app-utopic- i386-ci/ 64/console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/1453/ console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/861/ console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/webbrowser- app-ci/ 865/rebuild
http://