1f03e8d6f26286f2373f5ddc62aab8ba00491545: Merge m-c to b2g-inbound
Wes Kocher <wkocher@mozilla.com> - Tue, 21 Jan 2014 17:36:55 -0800 - rev 164601
Push 26053 by cbook@mozilla.com at Wed, 22 Jan 2014 13:00:38 +0000
Merge m-c to b2g-inbound
7d518cb968f682c9d6514aea4325e76827edaf98: Bug 960762 - Disable intermittent notification tests. r=gwagner
Michael Henretty <mhenretty@mozilla.com> - Wed, 22 Jan 2014 09:23:30 +0800 - rev 164600
Push 26053 by cbook@mozilla.com at Wed, 22 Jan 2014 13:00:38 +0000
Bug 960762 - Disable intermittent notification tests. r=gwagner
c0981146c891eca441ba09f581b0f07353a004c5: Bumping manifests a=b2g-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Tue, 21 Jan 2014 16:56:41 -0800 - rev 164599
Push 26053 by cbook@mozilla.com at Wed, 22 Jan 2014 13:00:38 +0000
Bumping manifests a=b2g-bump
14550ca2478edcff8b1b401500b4636a517fb1fc: Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Tue, 21 Jan 2014 16:55:13 -0800 - rev 164598
Push 26053 by cbook@mozilla.com at Wed, 22 Jan 2014 13:00:38 +0000
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8eabd20ad389 Author: James Burke <jrburke@gmail.com> Desc: Merge pull request #15569 from jrburke/bug960343-email-minify-2 Bug 960343 - email: minify JS r=asuth ======== https://hg.mozilla.org/integration/gaia-central/rev/0c6e48a2c4f2 Author: jrburke <jrburke@gmail.com> Desc: Bug 960343 - email: minify JS
86f4ac17777f092e589e7aa5c17ff84a008d3b84: Bumping manifests a=b2g-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Tue, 21 Jan 2014 16:35:59 -0800 - rev 164597
Push 26053 by cbook@mozilla.com at Wed, 22 Jan 2014 13:00:38 +0000
Bumping manifests a=b2g-bump
d7e48562f5914dba5d106fcb8619f462e53f0887: Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Tue, 21 Jan 2014 16:30:12 -0800 - rev 164596
Push 26053 by cbook@mozilla.com at Wed, 22 Jan 2014 13:00:38 +0000
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/90c6c41b439b Author: Marcus Cavanaugh <m@mcav.com> Desc: Merge pull request #15198 from gnaneswar/Issue_951072 Bug 951072 - [Clock] Text alignment issue in alarm list; r=hhuang r=mcav ======== https://hg.mozilla.org/integration/gaia-central/rev/b412d45bb524 Author: Gnaneswar Devuni <gnaneswar.devuni@accenture.com> Desc: Bug 951072 - [Clock] Text alignment issue in alarm list; r=reviews
87679ea5bb7d11d7ea30c7aaa83146246687a606: Bumping manifests a=b2g-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Tue, 21 Jan 2014 15:41:01 -0800 - rev 164595
Push 26053 by cbook@mozilla.com at Wed, 22 Jan 2014 13:00:38 +0000
Bumping manifests a=b2g-bump
d0cbc8d8b492f536e8993e6aae8181887e5b38f3: Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Tue, 21 Jan 2014 15:40:11 -0800 - rev 164594
Push 26053 by cbook@mozilla.com at Wed, 22 Jan 2014 13:00:38 +0000
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/7b386168c3f8 Author: jrburke <jrburke@gmail.com> Desc: Revert "Merge pull request #15430 from jrburke/bug960343-email-minify" This reverts commit e58e11c376048692a2c6830756e135f7c52f48a4, reversing changes made to 8d18b1e2fd06c84a879f99f6e8ca1f104eeacb13.
605a00e09496fc535d830fc052312796e5e5bf21: Bumping manifests a=b2g-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Tue, 21 Jan 2014 15:04:12 -0800 - rev 164593
Push 26053 by cbook@mozilla.com at Wed, 22 Jan 2014 13:00:38 +0000
Bumping manifests a=b2g-bump
492e084fa136fdec7b2ef1801ae0501110c456e1: Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Tue, 21 Jan 2014 15:00:19 -0800 - rev 164592
Push 26053 by cbook@mozilla.com at Wed, 22 Jan 2014 13:00:38 +0000
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/afb2469db615 Author: James Burke <jrburke@gmail.com> Desc: Merge pull request #15430 from jrburke/bug960343-email-minify Bug 960343 - email: minify JS r=asuth ======== https://hg.mozilla.org/integration/gaia-central/rev/60b9d666d9cc Author: jrburke <jrburke@gmail.com> Desc: Bug 960343 - email: minify JS
e08be9425388fe735c4d9033467bcd3362314956: merge mozilla-inbound to mozilla-central
Carsten "Tomcat" Book <cbook@mozilla.com> - Wed, 22 Jan 2014 13:53:15 +0100 - rev 164591
Push 26052 by cbook@mozilla.com at Wed, 22 Jan 2014 12:55:15 +0000
merge mozilla-inbound to mozilla-central
27b19b03da110c3d1b4e640c72b20c24a4191e94: Bug 958758. Refactor common image discard checks into one place. r=seth
Timothy Nikkel <tnikkel@gmail.com> - Tue, 21 Jan 2014 17:19:22 -0600 - rev 164590
Push 26052 by cbook@mozilla.com at Wed, 22 Jan 2014 12:55:15 +0000
Bug 958758. Refactor common image discard checks into one place. r=seth
cb09583bf5caa22196a06806c46cc7bbd2c1353a: Bug 958758. If we need to re-decode an image with different flags and shutting down the existing decoder has caused us to finish decoding we need to discard the image so we can create a new decoder with the new flags. r=seth
Timothy Nikkel <tnikkel@gmail.com> - Tue, 21 Jan 2014 17:19:20 -0600 - rev 164589
Push 26052 by cbook@mozilla.com at Wed, 22 Jan 2014 12:55:15 +0000
Bug 958758. If we need to re-decode an image with different flags and shutting down the existing decoder has caused us to finish decoding we need to discard the image so we can create a new decoder with the new flags. r=seth
7b94de064dc0fb3e78b843192d1c1fe4f8e951fe: Bug 962393 - don't use JS_InternString in MessageManager, r=bz
Olli Pettay <Olli.Pettay@helsinki.fi> - Wed, 22 Jan 2014 05:28:24 +0200 - rev 164588
Push 26052 by cbook@mozilla.com at Wed, 22 Jan 2014 12:55:15 +0000
Bug 962393 - don't use JS_InternString in MessageManager, r=bz
763a0f25391befe60965dfb3debc5c93dad1a2d2: Bug 950488 - Disallow zooming for overflow:hidden frames. r=kats
Botond Ballo <botond@mozilla.com> - Tue, 21 Jan 2014 11:51:46 -0500 - rev 164587
Push 26052 by cbook@mozilla.com at Wed, 22 Jan 2014 12:55:15 +0000
Bug 950488 - Disallow zooming for overflow:hidden frames. r=kats
28f8657d36e97b7eed9ba3b18771022985e98c0e: Bug 950488 - Overhaul APZ handling of overflow:hidden. r=botond
Benoit Girard <bgirard@mozilla.com> - Tue, 21 Jan 2014 12:33:52 -0500 - rev 164586
Push 26052 by cbook@mozilla.com at Wed, 22 Jan 2014 12:55:15 +0000
Bug 950488 - Overhaul APZ handling of overflow:hidden. r=botond
6bff1bb5e27783ddabdd3cbc94393ba9cd201029: Bug 961204 followup to address review comment. r=bholley
Boris Zbarsky <bzbarsky@mit.edu> - Tue, 21 Jan 2014 22:10:11 -0500 - rev 164585
Push 26052 by cbook@mozilla.com at Wed, 22 Jan 2014 12:55:15 +0000
Bug 961204 followup to address review comment. r=bholley
38aea88101ba9cb0252acb4371fb34aa1974cebf: Bug 961208 part 2. Change the WebIDL DoNewResolve hook signature to take a JSPropertyDescriptor. r=bholley
Boris Zbarsky <bzbarsky@mit.edu> - Tue, 21 Jan 2014 22:08:51 -0500 - rev 164584
Push 26052 by cbook@mozilla.com at Wed, 22 Jan 2014 12:55:15 +0000
Bug 961208 part 2. Change the WebIDL DoNewResolve hook signature to take a JSPropertyDescriptor. r=bholley
c7b17f121aee5798ec92fc16d2d73b7dc8ad8bb6: Bug 961208 part 1. When doing a DoNewResolve for Xrays, pass the Xray, not the underlying object, to DoNewResolve, in case people want to do permissions checks on the object. r=bholley
Boris Zbarsky <bzbarsky@mit.edu> - Tue, 21 Jan 2014 22:08:49 -0500 - rev 164583
Push 26052 by cbook@mozilla.com at Wed, 22 Jan 2014 12:55:15 +0000
Bug 961208 part 1. When doing a DoNewResolve for Xrays, pass the Xray, not the underlying object, to DoNewResolve, in case people want to do permissions checks on the object. r=bholley
ad626723a359e9b852f8295423f63a6802f02597: Bug 961204. Remove the my_context bits from nsWindowSH::NewResolve and just use the passed-in cx for everything. r=bholley
Boris Zbarsky <bzbarsky@mit.edu> - Tue, 21 Jan 2014 22:08:47 -0500 - rev 164582
Push 26052 by cbook@mozilla.com at Wed, 22 Jan 2014 12:55:15 +0000
Bug 961204. Remove the my_context bits from nsWindowSH::NewResolve and just use the passed-in cx for everything. r=bholley
(0) -100000 -30000 -10000 -3000 -1000 -300 -100 -50 -20 +20 +50 +100 +300 +1000 +3000 +10000 +30000 +100000 +300000 tip