Merge lp:~abreu-alexandre/oxide/fix-unloads-crash into lp:~oxide-developers/oxide/oxide.trunk
Status: | Superseded |
---|---|
Proposed branch: | lp:~abreu-alexandre/oxide/fix-unloads-crash |
Merge into: | lp:~oxide-developers/oxide/oxide.trunk |
Diff against target: |
158 lines (+72/-1) (has conflicts) 6 files modified
CHROMIUM_VERSION (+4/-0) patches/enable-accelerated-canvas-on-arale.patch (+4/-0) qt/VERSION (+4/-0) shared/browser/oxide_browser_process_main.cc (+6/-0) shared/browser/oxide_web_contents_unloader.cc (+36/-1) shared/browser/oxide_web_view.cc (+18/-0) Text conflict in CHROMIUM_VERSION Text conflict in patches/enable-accelerated-canvas-on-arale.patch Text conflict in qt/VERSION Text conflict in shared/browser/oxide_web_contents_unloader.cc Text conflict in shared/browser/oxide_web_view.cc |
To merge this branch: | bzr merge lp:~abreu-alexandre/oxide/fix-unloads-crash |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Coulson | Pending | ||
Review via email: mp+259191@code.launchpad.net |
This proposal has been superseded by a proposal from 2015-05-15.
Commit message
Fix premature web contents ptr release
Description of the change
Fix premature web contents ptr release
Unmerged revisions
- 1061. By Alexandre Abreu
-
Fix early web contents ptr release
- 1060. By Alexandre Abreu
-
Fix race in web contents unloads that can be triggered when the renderer dies as the contents unload has started
- 1059. By Chris Coulson
-
Bump Chromium rev to 43.0.2357.52
- 1058. By Chris Coulson
-
Automatically bump qt revision to 1.7.8
- 1057. By Olivier Tilloy
-
Fix a crash when a JS dialog is dismissed twice (by calling accept() and then reject() on it).
- 1056. By Olivier Tilloy
-
Fix a crash when a popup menu is dismissed twice (by calling accept() and then cancel() on it).
- 1055. By Chris Coulson
-
Bump Chromium rev to 43.0.2357.45
- 1054. By Chris Coulson
-
Automatically bump qt revision to 1.7.7
- 1053. By Chris Coulson
-
Don't crash when the frame tree is torn down during a process swap
- 1052. By Chris Coulson
-
Automatically bump qt revision to 1.7.6