Wes Kocher
f9f25580af
Merge m-c to fx-team, a=merge
2015-09-24 17:15:17 -07:00
Wes Kocher
6eca104071
Merge m-c to b2ginbound, a=merge
2015-09-24 17:14:44 -07:00
Wes Kocher
0d3937e34d
Merge b2ginbound to central, a=merge
2015-09-24 16:57:38 -07:00
Wes Kocher
0eeafe1fa4
Merge inbound to central, a=merge
2015-09-24 16:46:34 -07:00
B2G Bumper Bot
c3b2dc92ef
Bumping manifests a=b2g-bump
2015-09-24 15:10:12 -07:00
Wes Kocher
39cabbcacc
Backed out changeset 1da385d6c46b (bug 1021845) for b2g r3 and r7 permafail CLOSED TREE
2015-09-24 12:06:03 -07:00
Fabrice Desré
d4aa7f63e2
Bug 1204557 - Stop using base64 for native app icons in the application registry r=jchen
2015-09-24 11:53:05 -07:00
Wes Kocher
e1ad19c1cb
Backed out 2 changesets (bug 1034110) for test_mutationobserver_anonymous.html bustage CLOSED TREE
...
Backed out changeset 7b145ea2fbde (bug 1034110)
Backed out changeset 3a8904e50016 (bug 1034110)
2015-09-24 11:29:11 -07:00
Wes Kocher
b49a1bd566
Backed out changeset 8045d8fcbfe5 (bug 1203253) for browser_change_app_handler.js failures CLOSED TREE
2015-09-24 11:28:45 -07:00
Wes Kocher
d28eb4d8c9
Backed out bug 1083101 for build bustage CLOSED TREE
...
changesets backed out:
e39dfd9e05cb, cd54e93993b4, 61db1a51a7c4, c20fd7506bb7, b5e97b0facb7, cdf356cb817e, b058a918f443, d421e79326a2, 34a0be9af3f3, bba6f89ab775, 2fd5cfcea4e5
--HG--
extra : amend_source : 9dd084c69c78fd2248dfb1b9ba562b8a396ba205
extra : histedit_source : 7dc833e4d0e1656ed98f560b0bd8fec9e0aee3ef%2C1df84fdd3e0adae06356f9ffbafc49538ffb8729
2015-09-24 11:14:50 -07:00
Nicolas Silva
5c994c47a4
Bug 1083101 - Back 5 patches out due to windows build issues, CLOSED TREE.
2015-09-24 19:47:20 +02:00
J. Ryan Stinnett
4ab05a1789
Bug 1201535 - Test view source of srcdoc frames. r=mconley
2015-09-24 12:39:09 -05:00
J. Ryan Stinnett
c0dffd8c52
Bug 1201535 - Mark srcdoc as safe for loading in child. r=bz
...
When showing view source of a srcdoc frame in a tab, we load the frame content
via a page descriptor and use the URI "view-source:about:srcdoc".
Since we are creating a browser tab, the docshell's `InternalLoad` triggers the
browser's `shouldLoadURI` machinery that checks if we are in the correct process
for the given URI. This machinery will unwrap "view-source:" to "about:srcdoc"
and check if such an about page can be loaded in the child.
Marking "about:srcdoc" as safe for the child to load allows the view source
content of the frame to be displayed as expected.
2015-09-24 12:39:08 -05:00
J. Ryan Stinnett
eab474923e
Bug 1201535 - Open view source tabs with about:blank. r=bz
...
Loading a view source tab as "about:blank" gets us the fresh tab we need without
making redundant requests. The view source module will retrieve the actual data
as needed.
2015-09-24 12:39:07 -05:00
Nicolas Silva
b5f0ba8f9a
Bug 1083101 - build fix on CLOSED TREE
2015-09-24 19:11:26 +02:00
Fabrice Desré
b1f264280e
Bug 1207682 - Bring back android.support.v4.app.NotificationManagerCompat r=fabrice
2015-09-24 09:55:52 -07:00
Fabrice Desré
b32ea8e77e
Bug 1207417 - Settings mapper to sync b2g and android configurations r=snorp
2015-09-24 09:55:52 -07:00
Fabrice Desré
44b885ef4c
Bug 1201646 - Basic updates support r=snorp
2015-09-24 09:55:52 -07:00
Wander Lairson Costa
34798869bb
Bug 1207986: Add java-openjdk package to phone-builder image. r=garndt
...
This package is necessary to build Aries fota updates.
--HG--
extra : commitid : DAKZqS5wKeJ
2015-09-24 13:51:31 -03:00
B2G Bumper Bot
8cbb627c7a
Bumping manifests a=b2g-bump
2015-09-24 09:39:41 -07:00
B2G Bumper Bot
26c675b549
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/754c41de25dc
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Merge pull request #32003 from Cwiiis/bug1207534-new-homescreen-wrong-settings
Bug 1207534 - Correct the settings launcher. r=albertopq
========
https://hg.mozilla.org/integration/gaia-central/rev/654999d11702
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1207534 - Correct the settings launcher. r=albertopq
2015-09-24 09:36:47 -07:00
B2G Bumper Bot
e384637071
Bumping manifests a=b2g-bump
2015-09-24 09:30:13 -07:00
B2G Bumper Bot
62f942cc48
Bumping gaia.json for 5 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/61a77f72e2ef
Author: Carsten Book <tomcat@mozilla.com>
Desc: Merge pull request #31967 from ShakoHo/1205238
Bug 1205238 - Will raise Element is not currently visible and may not be manipulated when calling tap_comment(). r=npark
========
https://hg.mozilla.org/integration/gaia-central/rev/63fa9b6ac42f
Author: shako <sho@mozilla.com>
Desc: Bug 1205238 - Will raise Element is not currently visible and may not be manipulated when calling tap_comment()
========
https://hg.mozilla.org/integration/gaia-central/rev/78c7dadf4716
Author: shako <sho@mozilla.com>
Desc: Bug 1205238 - Will raise Element is not currently visible and may not be manipulated when calling tap_comment()
========
https://hg.mozilla.org/integration/gaia-central/rev/b319eb7771aa
Author: Carsten Book <tomcat@mozilla.com>
Desc: Merge pull request #32017 from aosmond/bug1196195
Bug 1196195 - Prevent multiple image resizes from being triggered. r=jdarcangelo
========
https://hg.mozilla.org/integration/gaia-central/rev/4a45e9ac45c3
Author: Andrew Osmond <aosmond@mozilla.com>
Desc: Bug 1196195 - Prevent multiple image resizes from being triggered.
2015-09-24 09:27:19 -07:00
B2G Bumper Bot
0dff5b9aea
Bumping manifests a=b2g-bump
2015-09-24 09:24:40 -07:00
B2G Bumper Bot
7db3d6c146
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/1091627afb83
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #31815 from BorisChiou/Bug1198522
Bug 1198522 - Separate customized and sys cmd menu items, r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/3ddd0ab5a52d
Author: Boris Chiou <boris.chiou@gmail.com>
Desc: Bug 1198522 - Fix the check for certified apps
2015-09-24 09:21:48 -07:00
B2G Bumper Bot
e3733c609f
Bumping manifests a=b2g-bump
2015-09-24 09:18:03 -07:00
B2G Bumper Bot
3a96f19981
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/65b6f43129f7
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #31988 from jedireza/private-browsing-alt
Bug 1193576 - Add a setting to browse privately by default
========
https://hg.mozilla.org/integration/gaia-central/rev/f6aa6128d480
Author: jedireza <reza@akhavan.me>
Desc: Bug 1193576 - Add a setting to browse privately by default
========
https://hg.mozilla.org/integration/gaia-central/rev/8586e41788d5
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #31984 from yzen/bug-1206305
Bug 1206305 - fixing a regression with ambient indicator flicker when…
========
https://hg.mozilla.org/integration/gaia-central/rev/a50272612e7a
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1206305 - fixing a regression with ambient indicator flicker when lockscreen is shown
2015-09-24 09:17:37 -07:00
Nicolas Silva
da625cae5a
Bug 1083101 - build fix on CLOSED TREE
2015-09-24 18:08:10 +02:00
Nicolas Silva
b7926684ad
Bug 1083101 - Make SyncObject's list of waiting jobs lock-free. r=jrmuizel
2015-09-24 17:35:47 +02:00
Nicolas Silva
38f6ea4b47
Bug 1083101 - rename gfx::Mutex into gfx::CriticalSection and move it to its own file. r=jrmuizel
2015-09-24 17:35:37 +02:00
Nicolas Silva
0819b3e7d5
Bug 1083101 - Win32 implementation of the JobScheduler. r=jrmuizel
2015-09-24 17:35:30 +02:00
Nicolas Silva
1ccd18a5b5
Bug 1083101 - Make gfx::DrawingCommand methods const. r=jrmuizel
2015-09-24 17:35:27 +02:00
Jared Wein
f40c529084
Bug 1203253 - Add back/port the tests that got removed from bug 1140495. r=gijs
...
--HG--
extra : rebase_source : e26563247012d87a31cd59c9d448fd6afbed1c48
2015-09-24 11:03:54 -04:00
Sebastian Kaspari
51dd4ba569
Bug 1207554 - TabMenuStrip: Fill viewport. r=mcomella
...
--HG--
extra : commitid : Wq3pePFRn
extra : rebase_source : 3ae7e76906069dbae77f16bb653008b7a961c0e6
2015-09-24 16:11:28 +02:00
Carsten "Tomcat" Book
2376775adf
merge mozilla-inbound to mozilla-central a=merge
2015-09-24 12:03:40 +02:00
Carsten "Tomcat" Book
ec1ec68f68
merge fx-team to mozilla-central a=merge
2015-09-24 12:01:40 +02:00
Gregory Szorc
fda95b5b85
Bug 1207912 - Use multiple rules for test archive generation; r=glandium
...
Previously, we had a single make target and rule for generating all test
archives. These tasks can be performed in parallel. This commit
refactors the make file to add multiple targets for each archive and
thus enables test archives to be generated concurrently.
On my MacBook Pro, this reduces `make package-tests -j8` from ~78s to
~50s, a reduction of ~28s, or ~36%. Reduction on machines without SSDs
(like many builders in automation) will likely be less. Although, the
page cache should service most file reads during archiving since these
files were just staged, so hopefully the gains are in the same ballpark.
--HG--
extra : commitid : 1PsEuE8KS7J
extra : rebase_source : b4ed9e593775d96a994b7076c6814d18ca277d8e
extra : histedit_source : f33af390df36d8ffe98df4f4329fa50a7cde6b0c
2015-09-23 23:28:19 -04:00
Phil Ringnalda
971bca22ce
Bug 1207911 - Disable webext tests on ASan builds for now
...
CLOSED TREE
2015-09-23 20:12:16 -07:00
Gregory Szorc
935d1d8b76
Bug 1207912 - Add a "stage-all" target; r=glandium
...
Upcoming work will introduce multiple targets for building test
archives. To prepare for this, we introduce a phony target that
tracks the staging of all test files so each target can gate on a common
prerequisite.
--HG--
extra : commitid : KcdyQv7sZqk
extra : rebase_source : a64336881990d65e11451b3f3858e4ff5c200eca
extra : histedit_source : 3cbbbd73d31f82108125dd6593c5974f2f42184c
2015-09-23 23:00:14 -04:00
Ted Mielczarek
1da63ab087
bug 1204985 horrible clobber-avoidance bustage fix r=YOLO CLOSED TREE
...
--HG--
extra : commitid : 9YLhI1kywCS
2015-09-23 22:05:01 -04:00
Xidorn Quan
e122198562
Bug 1137009 part 2 - Do not persist attributes of xul window if the window is in fullscreen. r=enndeakin
...
--HG--
extra : source : 19c3f7b23f53ae04f51458de6df339f3166fe3dc
extra : histedit_source : 4bad4820bca43ebf1cd30228c52b4126a35a25a5
2015-09-24 11:39:22 +10:00
Xidorn Quan
1fa3dc1199
Bug 1137009 part 1 - Always save dirty window attributes but do not persist them in nsXULWindow::SavePersistentAttributes() directly. r=enndeakin
...
The attributes should eventually be saved via the AttributeChanged callback in
XULDocument if one is specified in the "persist" attribute.
--HG--
extra : source : 31be6135097644dbfe99220be44e63a2163b243c
extra : histedit_source : 83959efa7bb52a31de2cdbc201b5f18655756f33
2015-09-24 11:39:22 +10:00
Wes Kocher
6aa4da4aa0
Merge m-c to fx-team, a=merge
2015-09-23 15:30:41 -07:00
Wes Kocher
31195b6f3f
Merge m-c to b2ginbound, a=merge
2015-09-23 15:30:19 -07:00
Wes Kocher
e4fc739f11
Merge m-c to fx-team, a=merge CLOSED TREE
2015-09-23 13:26:00 -07:00
Wes Kocher
268dd97805
Merge m-c to b2ginbound, a=merge CLOSED TREE
2015-09-23 13:25:06 -07:00
Wes Kocher
46c7f8fbad
Merge fx-team to central, a=merge CLOSED TREE
2015-09-23 13:22:10 -07:00
Wes Kocher
0625b82581
Merge b2ginbound to central, a=merge CLOSED TREE
2015-09-23 13:18:17 -07:00
Jared Wein
71808b231d
Bug 1205020 - Disable optimizations in TestTuple.cpp since it breaks the build on VS2013 Windows 10. r=froydnj
...
--HG--
extra : rebase_source : f209cc4dd8051562a4ef87313d0636f9dbee2132
2015-09-23 13:53:07 -04:00
B2G Bumper Bot
cf0d364a3d
Bumping manifests a=b2g-bump
2015-09-23 09:47:59 -07:00