Chris Kitching
cd435da803
Bug 892094 - Create "Search" page in settings. r=liuche
...
--HG--
rename : mobile/android/base/resources/xml/preferences_customize.xml => mobile/android/base/resources/xml-v11/preferences_customize.xml
rename : mobile/android/base/resources/xml/preferences_customize.xml => mobile/android/base/resources/xml/preferences_customize.xml.in
2013-07-16 18:44:42 -07:00
Wes Kocher
23c1ec0374
Backout 399362c3e135 (bug 894669) for bustage
2013-07-16 18:41:52 -07:00
Wes Kocher
c28e77b33d
Merge m-c to inbound
2013-07-16 18:22:58 -07:00
Ryan VanderMeulen
ec49bf763f
Backed out 10 changesets (bug 889911, bug 889714) due to merge conflicts on a CLOSED TREE.
...
Backed out changeset 1a1a536121da (bug 889714)
Backed out changeset 2cd88ef9eea5 (bug 889714)
Backed out changeset 489723887eca (bug 889714)
Backed out changeset 2b38ce22cf97 (bug 889714)
Backed out changeset 87b0a59a5d51 (bug 889714)
Backed out changeset 13229bab2ba4 (bug 889714)
Backed out changeset 234bd6d1fbed (bug 889714)
Backed out changeset 4f5f62284917 (bug 889714)
Backed out changeset 18537c4436c7 (bug 889911)
Backed out changeset ca7060ab1588 (bug 889911)
2013-07-16 21:16:31 -04:00
Jonathan Wilde
30246b6267
Bug 867543 - Part 3 - Dynamically update and pluralize the labels with all of the correct nouns attached. r=mbrubeck
...
--HG--
extra : rebase_source : b83293bfc40a12983a44e04295380d127c8b7227
2013-07-16 13:38:28 -07:00
Jonathan Wilde
0c883fac15
Bug 867543 - Part 2 - Add static labels. r=mbrubeck
...
--HG--
extra : rebase_source : bc7b5b58ecc667982160e325b99a45eb2cd9fd2a
2013-07-16 13:38:05 -07:00
Jonathan Wilde
938144dce6
Bug 867543 - Part 1 - Generalize appbar css, make sprites more robust, move into platform. r=mbrubeck
...
--HG--
extra : rebase_source : d12d41611423782497c03ceb05bd8b40afd1b921
2013-07-16 13:32:36 -07:00
Bobby Holley
5d8efcecad
Bug 889714 - Remove ContextCallback junk. r=mrbkap
...
There's no reason we should be doing this.
2013-07-16 18:04:51 -07:00
Bobby Holley
3e9e85214d
Bug 889714 - Use the SafeJSContext in XPCShellEnvironment. r=mrbkap
2013-07-16 18:04:50 -07:00
Bobby Holley
f47f63cd0d
Bug 889714 - Use SystemErrorReporter instead of ScriptErrorReporter. r=mrbkap
...
SystemErrorReporter is the new unified error reporter for everything non-dom.
In particular, it's used by the SafeJSContext, which we'll be switching to
here shortly.
2013-07-16 18:04:50 -07:00
Bobby Holley
8799208e0d
Bug 889714 - Stop manually holding onto system JSPrincipals. r=mrbkap
2013-07-16 18:04:50 -07:00
Bobby Holley
57ca6f634f
Bug 889714 - Stash the XPCShellEnvironment instance on the global, rather than the cx. r=mrbkap
...
We need to stash it somewhere, because the shell-provided JSNatives need to
access it. This solution only works for script running in the scope of the
global we create. Butthat's fine here, because we only use it for load() and
quit(), which only exist in the scope of that global.
2013-07-16 18:04:50 -07:00
Bobby Holley
04d727dd81
Bug 889714 - Reduce the number of places where we pull |env| off cx. r=mrbkap
2013-07-16 18:04:49 -07:00
Bobby Holley
82298ece09
Bug 889714 - Remove unused ExitCode machinery. r=mrbkap
...
This stuff is cribbed from xpcshell, where it makes sense. But it doens't really
make sense in the IPC context, and doesn't appear to be used either.
2013-07-16 18:04:49 -07:00
Bobby Holley
43d3561372
Bug 889714 - Removed unused ShouldReportWarnings and ShouldCompoleOnly [sic] machinery. r=mrbkap
...
lol @ 'ShouldCompoleOnly'.
2013-07-16 18:04:49 -07:00
Bobby Holley
b5be668356
Bug 889911 - Switch xpcshell to SystemErrorReporter with a little bit of special magic. r=mrbkap
...
XPCShell currently overrides all the JSContexts whose creation it observes with
its own custom error reporter. This reporter does all sorts of funny things which
we try to clean up for the most part. But there are a few very intricate
considerations at play.
First, the old xpcshell error reporter does some mumbo jumbo with the
XPCCallContext stack to try to guess whether some other code might catch the
exception. This is total garbage on a number of fronts, particularly because
the XPCCallContext stack has no concept of saved frame chains, nested event
loops, sandbox boundaries, origin boundaries, or any of the myriad of
complicating factors that determine whether or not an exception will propagate.
So we get rid of it. But this causes some crazy debugger tests to fail, because
they rely on an exception from uriloader/exthandler/nsHandlerService.js getting
squelched, and can't handle anybody reporting errors to the console service at
the particular moment of contortionism when the exception is raised. So we need
to introduce an explicit mechanism to disable the error reporter here to keep
things running.
Second, we have to be very careful about tracking the return status of the
xpcshell binary. The old code would simply flag an error code if the error
handler was invoked, and we can mostly continue to do that. But there are some
complications. See the comments.
Finally, we don't anything analogous in XPCShellEnvironment, because I have
patches in bug 889714 to remove its state-dependence on the error reporter.
I'll switch it to SystemErrorReporter in that bug.
2013-07-16 18:04:49 -07:00
Bobby Holley
36f5bb58ac
Bug 889911 - Introduce xpc::SystemErrorReporter, roughly based on mozJSComponentLoader's error reporter. r=mrbkap
2013-07-16 18:04:48 -07:00
Dan Gohman
70ae960f85
Bug 891695 - IonMonkey: Avoid passing pointers by const reference. r=rpearl
2013-07-16 16:00:03 -07:00
Brian Hackett
b03f3f0bcd
Bug 894669 - Add analysis for finding variables unnecessarily entrained by inner functions, r=luke.
2013-07-16 18:54:47 -06:00
Ed Morley
a178dd5cec
Merge latest green birch changeset and mozilla-central
2013-07-16 09:59:15 +01:00
Ed Morley
4bdb99926d
Merge latest green inbound changeset and mozilla-central
2013-07-16 09:57:55 +01:00
Gaia Pushbot
b06530a4a3
Bumping gaia.json for 1 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/37d94f0bacee
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 891277 - Update Usage assets, r=me
2013-07-15 20:10:23 -07:00
Gaia Pushbot
ecc5b02111
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/ae6bd540e71a
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #9326 from pauljt/bug863527_v2
Bug 863527 -- Safer html injection in app error, r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/d5bc2ff16c0c
Author: Paul Theriault <ptheriault@mozilla.com>
Desc: fix bug 863527 by updating test instead of parsing untrusted input
2013-07-15 20:00:22 -07:00
Gregory Szorc
702f2fca14
Bug 894197 - Define state directory in mach context object; r=jhammel
...
DONTBUILD (NPOTB)
2013-07-15 19:56:15 -07:00
Wes Kocher
64d86439a5
Backout 476a4bbbfdb2 (bug 890722) on a CLOSED TREE for breaking debug mochitests
2013-07-15 19:56:08 -07:00
Nick Alexander
0bcf6e7b68
Bug 890040 - Protect against orphans in Android health report uploader. r=rnewman
...
This does two main things. First, it tracks sets of obsolete document
IDs and retries obsoletes and deletes. Second, it tracks document IDs
that are attempted to be written to the server for obsolescence or
deletion without waiting for a server response to prevent orphaning
documents on successful upload and failed response.
The ObsoleteDocumentTracker uses a JSON map to maintain obsolete
document IDs and priority values. That's not the right data
structure; Bug 894194 tracks improving it.
2013-07-15 19:44:21 -07:00
Gaia Pushbot
c73305288f
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/82dbf4bd629a
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #10965 from huchengtw-moz/video/Bug_891929_remove_youtube_protocol_hack
Bug 891929 - Remove youtube protocol hack per landing of bug 887454, r=daleharvey
========
https://hg.mozilla.org/integration/gaia-central/rev/fac6cfa9692b
Author: John Hu <johu@mozilla.com>
Desc: Bug 891929 - Remove youtube protocol hack per landing of bug 887454
2013-07-15 19:15:23 -07:00
Gaia Pushbot
8dabd8294c
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/9b3ffbd7fe9f
Author: evanxd <itoyxd@gmail.com>
Desc: Merge pull request #10970 from evanxd/bug-893694
Bug 893694 - [Calendar] Update the 1.5x version of images for Calendar App
========
https://hg.mozilla.org/integration/gaia-central/rev/3b60d2882d1b
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 893694 - Update the 1.5x version of images.
2013-07-15 19:00:25 -07:00
Jared Wein
da8b02a8df
Backed out changeset 6d739868bd90 (bug 887515) for leaking windows on a CLOSED TREE.
2013-07-15 21:39:32 -04:00
Gaia Pushbot
889c2d36d7
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/911756823e45
Author: John Ford <john@johnford.info>
Desc: Merge pull request #10932 from brendandahl/pdfjs-v0.8.326
Bug 892721 - Update gaia pdf.js to version 0.8.326.
========
https://hg.mozilla.org/integration/gaia-central/rev/4631d9e630a8
Author: Brendan Dahl <brendan.dahl@gmail.com>
Desc: Bug 892721 - Update gaia pdf.js to version 0.8.326.
2013-07-15 17:45:23 -07:00
Shu-yu Guo
80306a1af0
Bug 893679 - Followup: Make sure rvalType is MIRType_Value when barrier is true to fix bustage on a CLOSED TREE. (r=bhackett)
2013-07-16 01:49:54 +02:00
Jeff Walden
f7cdc0b73d
Convert SN_MAKE_TERMINATOR and SN_IS_TERMINATOR to inline functions to avoid clang+ccache warnings about over-parenthesized equality expressions. No bug, rs=terrence
...
--HG--
extra : rebase_source : 50b8f70501a481a4dda715284ccd9a21bbfa0eb6
2013-07-15 15:26:04 -07:00
Nicolas B. Pierron
f5e41e585a
Bug 876029 - Add Missing MPL header. r=jlebar DONTBUILD
2013-07-15 15:25:07 -07:00
Matt Brubeck
0ca7a95671
Bug 892759 - Add basic tests for the Metro find in page bar [r=rsilveira]
2013-07-15 15:20:32 -07:00
Matt Brubeck
0aabf6b14e
Bug 892759 - Minor code cleanup in metro/base/content/browser-ui.js [r=rsilveira]
2013-07-15 15:20:32 -07:00
Ryan VanderMeulen
3cc4f8b044
Merge inbound to m-c.
2013-07-15 17:03:59 -04:00
Ryan VanderMeulen
697e1bd389
Merge birch to m-c.
2013-07-15 17:03:17 -04:00
Gaia Pushbot
2bc93784ca
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/846f8e708936
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #10983 from gaye/bug-889396
Bug 889396 - Sync button went away r=lightsofapollo
========
https://hg.mozilla.org/integration/gaia-central/rev/87f21415dc13
Author: gaye <gaye@mozilla.com>
Desc: Bug 889396 - Sync button went away
2013-07-15 13:15:23 -07:00
Gaia Pushbot
f7cc635d24
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/d266560b990b
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Merge pull request #10990 from jonallengriffin/disablebusytime
Bug 893248 - Disable busytime_test.js for near perma-orange in TBPL, a=t...
========
https://hg.mozilla.org/integration/gaia-central/rev/f42afb0f2a73
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Bug 893248 - Disable busytime_test.js for near perma-orange in TBPL, a=test-only
2013-07-15 12:55:23 -07:00
Gaia Pushbot
3d8074e01e
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/9a8405332100
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Merge pull request #10988 from jonallengriffin/disablegridtest
Bug 892658 - Disable grid_test.js in TBPL for very frequent orange, a=te...
========
https://hg.mozilla.org/integration/gaia-central/rev/56e5813a8ab9
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Bug 892658 - Disable grid_test.js in TBPL for very frequent orange, a=test-only
2013-07-15 12:30:23 -07:00
Gaia Pushbot
7492d1f849
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e44b13b6a7b0
Author: Rudy Lu <left.lu@gmail.com>
Desc: Merge pull request #10939 from RudyLu/homescreen/4x5grid_onWVGA_support
Bug 881149 - hdpi/xhdpi resolution layout for Homescreen app. r=crdlc.
========
https://hg.mozilla.org/integration/gaia-central/rev/5dbcf6c990dd
Author: Rudy Lu <left.lu@gmail.com>
Desc: Bug 881149 - hdpi/xhdpi resolution layout for Homescreen app
1. adjust to show 4 x 5 grid on WVGA.
2. modify the scale ratio of app icon according to
window.devicePixelRatio.
==============
1. To address review comment, for reset the hidden of the 17th icon
2. Add 1.5x graphics (not complete, some assets are still missing)
2013-07-15 11:35:23 -07:00
Gaia Pushbot
31a1d4120d
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/686f7e5027bd
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #10930 from eeejay/lockscreen-elastic-fix
Bug 892649 - Make sure elastic is never played when screen reader is enabled r=kgrandon
========
https://hg.mozilla.org/integration/gaia-central/rev/024a08abc7cd
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 892649 - Make sure elastic is never played when screen reader is enabled.
2013-07-15 10:30:22 -07:00
Ryan VanderMeulen
0abf13413c
Backed out changeset d8a89848224b (bug 890928) for B2G mochitest-9 failures.
2013-07-15 13:19:41 -04:00
Gregor Wagner
140c79151c
Bug 892497 - [contacts] the upgrade path is error-prone. r=bent
2013-07-15 10:16:33 -07:00
Gaia Pushbot
a510aac23a
Bumping gaia.json for 1 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/77058600c39f
Author: Corey Frang <gnarf37@gmail.com>
Desc: Bug 891908 - [MMS] Replacing an attachment with a large image should trigger resizing - r=schung
* Ensure that image resizing is triggered whenever an image is added (even via replace)
2013-07-15 10:15:24 -07:00
Gaia Pushbot
4c2f92b3c1
Bumping gaia.json for 1 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/02b50e5b3ca8
Author: Corey Frang <gnarf37@gmail.com>
Desc: Bug 892480 - [SMS] Sending two phone numbers separed by space or enter should detect two phone numbers - r=arcturus
* Shorten the greediness of the match to not accept as many numbers
* Added a check to ensure that the character after the match is not a digit
* Only allow space and tab as separators in phone numbers
2013-07-15 09:55:22 -07:00
Gaia Pushbot
78aa8446de
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/c61d272d29ae
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #10871 from KevinGrandon/bug_882346_add_date_time_mappings_for_now
Bug 882346 - Add date time mappings for now r=vingtetun,lightsofapollo
========
https://hg.mozilla.org/integration/gaia-central/rev/8515ff8e847a
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 882346 - Add dom.experimental_forms pref
2013-07-15 09:00:23 -07:00
Gaia Pushbot
cb9df13764
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3451c5dbd0bf
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #10951 from KevinGrandon/bug_893188_fix_system_messages
Bug 893188 - Update system message manager r=vingtetun
========
https://hg.mozilla.org/integration/gaia-central/rev/d5d6294ffcef
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 893188 - Update system message manager
2013-07-15 08:50:22 -07:00
Ryan VanderMeulen
b39f89045b
Bug 832768 - Disable test_buffered.html due to frequent timeouts.
2013-07-15 11:45:10 -04:00
Ed Morley
941b06e491
Backed out changeset 9897835271b5 (bug 877690) for crashes on a CLOSED TREE
2013-07-15 16:36:17 +01:00