Ryan VanderMeulen
4daff368b0
Merge b2g-inbound to m-c.
2013-09-26 21:32:43 -04:00
Ryan VanderMeulen
a759e3fa7b
Merge inbound to m-c.
2013-09-26 21:29:08 -04:00
Gregory Szorc
261e4c161f
Bug 921198 - Increase pymake recursion limit (again); r=glandium
2013-09-26 14:43:45 -07:00
Ehsan Akhgari
7b5f2c53b1
Bug 915735 - Part 2: Tickle stdout when linking the PGOed xul.dll; r=ted
2013-09-26 16:54:48 -04:00
Wes Kocher
5b7c6d0a03
Backed out changeset 96974bd168a5 (bug 920831). Test mentioning MozInputMethod failed.
2013-09-26 13:53:54 -07:00
Gaia Pushbot
538ee95e3b
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/c9f88878f616
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #12458 from eeejay/bug-920796
Bug 920796 - Add menu roles to sleep menu. r=vingtetun
========
https://hg.mozilla.org/integration/gaia-central/rev/5f9ff6d7dd34
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 920796 - Add menu roles to sleep menu
2013-09-26 13:00:27 -07:00
Gaia Pushbot
8f661ca93d
Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/43f89977f3a5
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 920037 - [Messages] In participant option menu, overlay display should only dislay unknown number/email once r=julienw
https://bugzilla.mozilla.org/show_bug.cgi?id=920037
- Re-organize the assignment of OptionMenu params
- Always set params.section. If the participant is an known contact participant a node will be rendered, otherwise the content will be an empty string
- Limit calls to renderContact for those participants that are known contacts
- Update tests
- assert content of params.header value
- assert that params.section is an empty string for unknown participants
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
2013-09-26 12:50:23 -07:00
Gaia Pushbot
63a989c555
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/77926589c07c
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #12478 from gaye/bug-902124
Bug 902124 - Followup to fix passing NPM_REGISTRY to gaia-marionette
========
https://hg.mozilla.org/integration/gaia-central/rev/63253f9fd46f
Author: Gareth Aye <gaye@mozilla.com>
Desc: Bug 902124 - Followup to fix passing NPM_REGISTRY to gaia-marionette
2013-09-26 12:36:24 -07:00
Ryan VanderMeulen
cba819222d
Bug 921071 - Add in-tree configs for B2G emulator-ics. r=aki
...
--HG--
rename : b2g/config/emulator/config.json => b2g/config/emulator-ics/config.json
rename : b2g/config/emulator/releng-emulator.tt => b2g/config/emulator-ics/releng-emulator-ics.tt
2013-09-26 15:06:35 -04:00
Ben Hearsum
acf5ea2df8
bug 803531: renew authenticode certificates in september 2013 - update authenticode issuer in tree. r=rstrong
2013-09-26 13:44:27 -04:00
Carsten "Tomcat" Book
dc6420d31c
merge fx-team to mc
2013-09-26 14:14:13 +02:00
Carsten "Tomcat" Book
57fbf69f1c
merge b2g-inbound to mc
2013-09-26 13:32:33 +02:00
Yuan Xulei
47024e5bf7
Bug 920831 - MozInputMethod's init should only return undefined. r=bz
2013-09-26 15:10:56 +08:00
Gaia Pushbot
d8d3f31e43
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/01a6fb085eb8
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #12476 from teodosia/fix-unlock-to-homescreen
Bug 921053 - Fix failing lockscreen/test_lockscreen_unlock_to_homescreen.py on master r=zac
========
https://hg.mozilla.org/integration/gaia-central/rev/d511a8385989
Author: Teodosia Pop <teodosia.pop@gmail.com>
Desc: Bug 921053 - Fix failing lockscreen/test_lockscreen_unlock_to_homescreen.py on master
2013-09-26 10:00:26 -07:00
Gaia Pushbot
943a247997
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f96c71f7ec88
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #12445 from Rik/incoming-tap-screen-901168
Bug 901168 - Tapping the center of the screen while receiving a call lea... r=etienne
========
https://hg.mozilla.org/integration/gaia-central/rev/35c74712ccf2
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 901168 - Tapping the center of the screen while receiving a call leaves the call in an unanswerable state
2013-09-26 09:36:26 -07:00
Gaia Pushbot
d8d6c6704e
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0c4b87f3bee9
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #12469 from crdlc/bug-920948
Bug 920948 - [Bug] Sometimes drag&drop is not working fine with collections
========
https://hg.mozilla.org/integration/gaia-central/rev/1f54f42eea24
Author: crdlc <crdlc@tid.es>
Desc: Bug 920948 - [Bug] Sometimes drag&drop is not working fine with collections
2013-09-26 08:15:24 -07:00
Andrew Halberstadt
b150c38ee9
Bug 920718 - Update b2g desktop mochitests for bug 746243, r=jhammel
2013-09-26 09:58:08 -04:00
Carsten "Tomcat" Book
e787c4d87b
Merge m-c to b2g-inbound
2013-09-26 15:53:39 +02:00
Eric Chou
5da8be45bb
Bug 919853 - Add mimetype and extension mapping of vCard, r=bz, r=arcturus
2013-09-26 14:25:50 +08:00
Gaia Pushbot
6b1dada0b4
Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/43bc58df001f
Author: GaryChen(pychen) <mmm198219@gmail.com>
Desc: Revert "Merge pull request #12420 from mpizza/Bug_920394_buidTime_keyboard"
This reverts commit 4bbd1850a60925fc6ae7aa7a14b9b634a8187607, reversing
changes made to d90878009b4d864e690b0d382f33a781f1ed0bc1.
Revert "Merge pull request #12005 from mcirlanaru/bug_913782"
This reverts commit 51eb595572dfde7e3af451a9b30b3e22db1fdab2, reversing
changes made to b3d003e1c92f6bd685be275b57f17d186ffcaaa7.
bug 920588 : backout above commit on master
2013-09-25 22:15:24 -07:00
Gaia Pushbot
8bd12667ad
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4e142710052a
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #12378 from EragonJ/bug-876291
Bug 876291 - [Bluetooth] Change phone name screen needs to be updated to use building blocks, r=@crh0716
========
https://hg.mozilla.org/integration/gaia-central/rev/53c4640b4e53
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 876291 - [Bluetooth] Change phone name screen needs to be updated to use building blocks
- use latest BB to show up prompt modal
2013-09-25 21:40:22 -07:00
Wes Kocher
9043d09269
Merge central to b2g-inbound
2013-09-25 21:07:03 -07:00
Nicholas Nethercote
d6b54753e5
Bug 920818 (part 3) - Remove js/src/editline/Makefile.ref, because it's dead. r=glandium.
...
--HG--
extra : rebase_source : 40b56cc617dcd741c26e3519af2619f11fbf5f65
2013-09-25 20:45:54 -07:00
Wes Kocher
da7ee05003
Merge mx-team to m-c
2013-09-25 20:43:35 -07:00
Wes Kocher
aedab72033
Merge b2g-inbound to m-c
2013-09-25 20:32:39 -07:00
Wes Kocher
95d7c5d212
Merge inbound to m-c
2013-09-25 20:25:06 -07:00
Gaia Pushbot
b900f04276
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e474736e925e
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #12424 from gasolin/issue-920042
Bug 920042 - [Flatfish] not minimize appWraper bar while swipe up to hom...r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/9ba8915376c4
Author: gasolin <gasolin@gmail.com>
Desc: Bug 920042 - [Flatfish] not minimize appWraper bar while swipe up to home gesture is enabled
2013-09-25 19:40:23 -07:00
Gaia Pushbot
03e7056399
Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/231ca8b58142
Author: root <root@vivien-clam>
Desc: Revert "Bug 920561 - Ensure LazyLoader.load does not slow down app rendering. r=mbudzynski,kgrandon"
This reverts commit 8ed692c6c6df1fcabe3c65ca8fee9cd54e625244.
2013-09-25 19:30:25 -07:00
Douglas Crosher
56e4a047a3
Bug 919958 - Odinmonkey: disable movement of heap loads as a workaround while the real problem is explored (r=bbouvier)
...
--HG--
extra : rebase_source : 7ec73d4d0093086e61d1a1f99ffa8afcd33017aa
2013-09-26 11:06:53 +10:00
Nicholas Nethercote
b8de9fcc9c
Bug 414087 (part 2) - Remove insignificant wasted space in StackBlock. r=bz.
2013-09-25 21:28:55 -07:00
Nicholas Nethercote
0fcd442c1f
Bug 414087 (part 1) - Clean up the style of StackArena.{h,cpp}. r=bz.
2013-09-25 21:28:46 -07:00
Phil Ringnalda
935ad6b687
Merge m-c to m-i
2013-09-25 21:30:59 -07:00
L. David Baron
5f6c17426f
Followup to bug 828312 patch 9a: Mark test as fuzzy-if on Android. CLOSED TREE
2013-09-25 17:53:12 -07:00
L. David Baron
822f15428f
Followup to bug 828312 patch 9a: Mark test as fuzzy-if on Mac OS X 10.8, where the Ahem font is behaving in ways it shouldn't. CLOSED TREE
2013-09-25 15:45:24 -07:00
Ryan VanderMeulen
72c8f599cd
Backed out 5 changesets (bug 905493, bug 920125, bug 919603) for mochitest orange on a CLOSED TREE.
...
Backed out changeset ccef656b2973 (bug 919603)
Backed out changeset 4b29ce0b2fff (bug 919603)
Backed out changeset b0a051ec55b7 (bug 919603)
Backed out changeset baa9a774aad1 (bug 920125)
Backed out changeset e03276bf4eaa (bug 905493)
2013-09-25 18:22:33 -04:00
Gaia Pushbot
859382f6ce
Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f22c641c064a
Author: Ben Kelly <ben@wanderview.com>
Desc: Revert "Bug 920561 - Ensure LazyLoader.load does not slow down app rendering. r=mbudzynski"
This reverts commit 6dcb079db2ad16a2b2995c039f358ff9d6a2f6d4.
2013-09-25 14:55:24 -07:00
Ryan VanderMeulen
acaab256b9
Bug 907908 - Mark 776265-1a.html as random-if on Android 2.2 for too many intermittent failures.
...
DONTBUILD CLOSED TREE
2013-09-25 17:02:07 -04:00
Ryan VanderMeulen
98ce790ec4
Bug 907905 - Mark 647192-1.html as random-if on Android 2.2 for too many intermittent failures.
2013-09-25 17:01:53 -04:00
Gregory Szorc
6148208076
NO BUG Convert documentation Vagrantfile to work with Mozilla's Jenkins instance
...
DONTBUILD (NPOTB)
2013-09-25 13:55:46 -07:00
Gaia Pushbot
936895b93d
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/cd489d362898
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #12449 from teodosia/fix-capture-video
Bug 920598 - Fix failing /camera/test_camera_capture_video.py on master
========
https://hg.mozilla.org/integration/gaia-central/rev/221338354449
Author: Teodosia Pop <teodosia.pop@gmail.com>
Desc: Bug 920598 - Fix failing /camera/test_camera_capture_video.py on master
2013-09-25 13:45:28 -07:00
Matt Brubeck
237f919f78
Bug 900072 - Work around line wrapping bugs in flyoutpanels [r=sfoster]
2013-09-25 13:42:46 -07:00
Matt Brubeck
d77e1bb231
Bug 920333 - Use a white background by default for thumbnail tile icon and label [r=sfoster]
2013-09-25 13:42:09 -07:00
Matt Brubeck
8177fa25cf
Bug 875924 - Initialize the NewTabUtils thumbnail expiration filter [r=sfoster]
2013-09-25 13:41:29 -07:00
Boris Zbarsky
5cded4e7a5
Bug 919603 followup. Make sure EventTarget has a [Global] descendant, so it actually works right. r=peterv pending, because CLOSED TREE
2013-09-25 16:07:08 -04:00
Gregory Szorc
4fa40ac450
NO BUG Add Vagrantfile for documentation build environment
...
DONTBUILD (NPOTB)
2013-09-25 13:05:57 -07:00
Ryan VanderMeulen
7154f877b8
Backed out changeset 272dabb40b3d (bug 843019) for mochitest-bc failures.
2013-09-25 15:29:06 -04:00
Brian Smith
c766c7c19d
Bug 920248: Temporarily disable TLS false start, r=keeler, r=wtc
...
--HG--
extra : rebase_source : 4fc35de2d6e2dc99de11b2a2d0c0f3ebe1de8b97
2013-09-25 12:00:36 -07:00
L. David Baron
0754b253b8
Bug 828312 patch 11: Don't generate change hints for restyling of later continuations, since the handling of the change hints from the first continuation is required to do the necessary work. r=bzbarsky
...
This depends on bug 898333 in order to avoid causing:
TEST-UNEXPECTED-FAIL | chrome://mochitests/content/chrome/dom/tests/mochitest/chrome/test_focused_link_scroll.xul | Assertion count 1 is greater than expected range 0-0 assertions.
due to the assertion:
###!!! ASSERTION: Shouldn't be trying to restyle non-elements directly: '!aContent || aContent->IsElement()', file ../../../layout/base/nsStyleChangeList.cpp, line 62
The assertion count change in layout/generic/crashtests/571995.xhtml is
expected because it changes us from having 7 of:
###!!! ASSERTION: Shouldn't be trying to restyle non-elements directly: '!aContent || aContent->IsElement()', file ../../../layout/base/nsStyleChangeList.cpp, line 62
with the stack:
mozilla::ElementRestyler::CaptureChange(nsStyleContext*, nsStyleContext*, nsChangeHint) [layout/base/nsChangeHint.h:191]
mozilla::ElementRestyler::RestyleSelf(nsRestyleHint) [layout/base/RestyleManager.cpp:2304]
to only having one. This is expected since this patch changes
RestyleSelf to only call CaptureChange for the first continuation or
block-in-inline sibling.
2013-09-25 12:28:08 -07:00
L. David Baron
a26324d12e
Bug 828312 patch 10: Add assertions to check that handling of nsChangeHint_ChildrenOnlyTransform doesn't need to check continuations. r=bzbarsky
...
This is part of the patch stack making change hints apply across all
continuations and block-in-inline siblings.
2013-09-25 12:28:08 -07:00
L. David Baron
7888d4666c
Bug 828312 patch 9b: Make handling of RecomputePosition hint check continuations. r=bzbarsky
...
This is part of the patch stack making change hints apply across all
continuations and block-in-inline siblings.
2013-09-25 12:28:08 -07:00