142ec80ad2
Merge m-c to b2g-inbound
2013-09-26 15:53:39 +02:00
172aff981e
merge fx-team to mc
2013-09-26 14:14:13 +02:00
9edc250e46
merge b2g-inbound to mc
2013-09-26 13:32:33 +02:00
b01f9e082f
Bug 919853 - Add mimetype and extension mapping of vCard, r=bz, r=arcturus
2013-09-26 14:25:50 +08:00
900c04a173
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
122d685242
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
f2f4520891
Merge central to b2g-inbound
2013-09-25 21:07:03 -07:00
f48da134e3
Merge mx-team to m-c
2013-09-25 20:43:35 -07:00
ef01dd9a6a
Merge b2g-inbound to m-c
2013-09-25 20:32:39 -07:00
ac9e322665
Merge inbound to m-c
2013-09-25 20:25:06 -07:00
86f7cdd5d0
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
b9b54ae6dd
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
e85880f63c
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
228510e1ec
Bug 414087 (part 2) - Remove insignificant wasted space in StackBlock. r=bz.
2013-09-25 21:28:55 -07:00
929154dfe5
Bug 414087 (part 1) - Clean up the style of StackArena.{h,cpp}. r=bz.
2013-09-25 21:28:46 -07:00
552c5bd45c
Merge m-c to m-i
2013-09-25 21:30:59 -07:00
c5d18cf77f
Followup to bug 828312 patch 9a: Mark test as fuzzy-if on Android. CLOSED TREE
2013-09-25 17:53:12 -07:00
6404578a6b
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
b2c316d8b2
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
2db38bdc08
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
0eb7473289
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
aaa79d7829
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
f8faf63224
NO BUG Convert documentation Vagrantfile to work with Mozilla's Jenkins instance
...
DONTBUILD (NPOTB)
2013-09-25 13:55:46 -07:00
18db0673f6
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
5ba8170923
Bug 900072 - Work around line wrapping bugs in flyoutpanels [r=sfoster]
2013-09-25 13:42:46 -07:00
b876771668
Bug 920333 - Use a white background by default for thumbnail tile icon and label [r=sfoster]
2013-09-25 13:42:09 -07:00
5c2f923778
Bug 875924 - Initialize the NewTabUtils thumbnail expiration filter [r=sfoster]
2013-09-25 13:41:29 -07:00
dc1d69b547
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
a3a5ce0f41
NO BUG Add Vagrantfile for documentation build environment
...
DONTBUILD (NPOTB)
2013-09-25 13:05:57 -07:00
5a3c6a793e
Backed out changeset 272dabb40b3d (bug 843019) for mochitest-bc failures.
2013-09-25 15:29:06 -04:00
faaf3281fa
Bug 920248: Temporarily disable TLS false start, r=keeler, r=wtc
...
--HG--
extra : rebase_source : 4fc35de2d6e2dc99de11b2a2d0c0f3ebe1de8b97
2013-09-25 12:00:36 -07:00
d01753dad0
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
36acc15f31
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
4e703ff333
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
d0255c650f
Bug 828312 patch 9a: Make sticky positioning handle block-in-inline splits correctly. r=dholbert
...
This assumes that the specification for how position:sticky behaves for
block-in-inline splits matches the specification for position:relative,
in other words, matches
http://www.w3.org/TR/CSS21/visuren.html#anonymous-block-level .
It's also necessary for patch 9b since the new rule for handling of
style change hints is that a style change hint applies to all
continuations and all block-in-inline siblings ("special siblings").
The change in StickyScrollContainer::GetScrollRanges is really the fix
for bug 918994, but adjusted for the change here to use block-in-inline
siblings ("special siblings") in addition to continuations.
2013-09-25 12:28:08 -07:00
95e754510e
Bug 828312 patch 8: Make handling of UpdateEffects 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:07 -07:00
82151d1958
Bug 828312 patch 7: Use more typical loop structure and don't mutate |frame| in UpdateOverflow hint handling. r=bzbarsky
2013-09-25 12:28:07 -07:00
b741eb1e7b
Bug 828312 patch 6: Make early transform handling 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:07 -07:00
ee558d6e79
Bug 828312 patch 5: Don't handle UpdateCursor more than once per round of style change processing, since it's global. r=bzbarsky
...
(This is part of the patch stack making change hints apply across all
continuations and block-in-inline siblings. In this case, however, the
change hint only needs to apply once, globally.)
2013-09-25 12:28:07 -07:00
e1a486d3f2
Bug 898209 patch 16: Move a comment that should have been moved in patch 15. No review.
2013-09-25 12:28:07 -07:00
c18e1d2515
Bug 898333, patch 2: Change RestyleManager::Restyle's tree traversal to reach next-continuations (and same-display block-in-inline siblings) from their prev-continuation rather than from their parent. r=bzbarsky
...
This patch fundamentally makes three changes:
(1) Change the way RestyleSelf is used so that it is called in a loop,
over all of the same-style continuations and block-in-inline
siblings.
(I had a note here reminding myself:
TODO: Don't set hints for descendants!
but I no longer remember what it meant.)
(2) Change the traversal of children to traverse all of the children of
the items traversed in (1).
(3) When traversing children, skip children that are continuations,
since we already reached them in (1) and (2).
A later patch will change the RestyleSelf loop to copy for the later
continuations rather than repeating the work. This will mean reverting
many of the RestyleSelf changes contained here.
Some of the pieces marked temporary will be removed in bug 828312 patch
11, and the rest should hopefully be removed in bug 918064.
2013-09-25 12:28:07 -07:00
38a76e02ae
Bug 898333, patch 1: Restyle the :after pseudo-element after the content children. r=bzbarsky
2013-09-25 12:28:07 -07:00
25131b61a4
Merge m-c to fx-team.
2013-09-25 14:57:55 -04:00
0f204ee67f
Merge m-c to b2g-inbound.
2013-09-25 14:57:08 -04:00
64acb4c746
Bug 920642: Remove dead files from bug 870171. r=rnewman
2013-09-25 11:52:48 -07:00
d7387842c3
Merge the last PGO-green inbound changeset to m-c.
2013-09-25 14:51:55 -04:00
ccc14a9e83
Bug 920532 - Lots of "System JS : ERROR file:///builds/slave/test/build/b2g/components/MozKeyboard.js:380 TypeError: this._inputcontext is null" r=me
2013-09-25 11:42:40 -07:00
2938d8ed09
Merge fx-team to m-c.
2013-09-25 14:38:02 -04:00
b19b0bb33f
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/1bfa9e10dc2b
Author: Salvador de la Puente González <salva@unoyunodiez.com>
Desc: Merge pull request #12387 from leob2g/Bug_915992_Changing_default_configuration_to_Postpaid
[Cost Control] Bug_915992_Changing_default_config_to_Postpaid r=lodr
========
https://hg.mozilla.org/integration/gaia-central/rev/ebc57c722136
Author: sarath27.vs <sarath27.vs@lge.com>
Desc: Changing default config to Postpaid
2013-09-25 11:30:23 -07:00
179ed0143a
Merge b2g-inbound to m-c.
2013-09-25 14:27:43 -04:00
Carsten "Tomcat" Book
Eric Chou
Gaia Pushbot
Wes Kocher
Douglas Crosher
Nicholas Nethercote
Phil Ringnalda
L. David Baron
Ryan VanderMeulen
Gregory Szorc
Matt Brubeck
Boris Zbarsky
Brian Smith
Michael Comella
Fabrice Desré