Commit Graph

148941 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
38163c2a9d Merge m-c to b2g-inbound 2013-09-26 15:53:39 +02:00
Eric Chou
92f54bfce5 Bug 919853 - Add mimetype and extension mapping of vCard, r=bz, r=arcturus 2013-09-26 14:25:50 +08:00
Gaia Pushbot
c6ab0be25b 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
98550c8e64 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
cde89349d3 Merge central to b2g-inbound 2013-09-25 21:07:03 -07:00
Nicholas Nethercote
1a3b14b4c3 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
92b85e697e Merge mx-team to m-c 2013-09-25 20:43:35 -07:00
Wes Kocher
ddd210deb6 Merge b2g-inbound to m-c 2013-09-25 20:32:39 -07:00
Wes Kocher
d23c887db8 Merge inbound to m-c 2013-09-25 20:25:06 -07:00
Nicholas Nethercote
2d9b5e156d Bug 920852 (part 4) - Reorder a bunch of stuff. r=till.
--HG--
extra : rebase_source : b386abc4bfcdc85fad4071eeb06de2ca83a17bd8
2013-09-25 20:17:19 -07:00
Gaia Pushbot
55967bddae 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
a3ed116c36 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
80281e76f2 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
159167c25b Bug 414087 (part 2) - Remove insignificant wasted space in StackBlock. r=bz. 2013-09-25 21:28:55 -07:00
Nicholas Nethercote
0f4f62f070 Bug 414087 (part 1) - Clean up the style of StackArena.{h,cpp}. r=bz. 2013-09-25 21:28:46 -07:00
Phil Ringnalda
a7a5c15785 Merge m-c to m-i 2013-09-25 21:30:59 -07:00
L. David Baron
3e3eba12f0 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
93872ab342 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
0916615899 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
0c5e6623dd 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
62eed64bbe 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
a6baf49d6e 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
b8615b896d NO BUG Convert documentation Vagrantfile to work with Mozilla's Jenkins instance
DONTBUILD (NPOTB)
2013-09-25 13:55:46 -07:00
Gaia Pushbot
d59c02b339 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
f228d53ab5 Bug 900072 - Work around line wrapping bugs in flyoutpanels [r=sfoster] 2013-09-25 13:42:46 -07:00
Matt Brubeck
4ff90a1693 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
33acc6693c Bug 875924 - Initialize the NewTabUtils thumbnail expiration filter [r=sfoster] 2013-09-25 13:41:29 -07:00
Boris Zbarsky
35745162c2 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
ea4a1ee18e NO BUG Add Vagrantfile for documentation build environment
DONTBUILD (NPOTB)
2013-09-25 13:05:57 -07:00
Ryan VanderMeulen
5382a14a1e Backed out changeset 272dabb40b3d (bug 843019) for mochitest-bc failures. 2013-09-25 15:29:06 -04:00
Brian Smith
275e5cbaaf 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
38a6d76524 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
b19b847ec9 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
b0e32cdf38 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
L. David Baron
31df6fcc33 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
L. David Baron
4e7bd63a47 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
L. David Baron
eddf04ceed 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
L. David Baron
2ffabf4425 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
L. David Baron
7bb0d89ddf 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
L. David Baron
2c713d5f2d 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
L. David Baron
06fe81c384 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
L. David Baron
d6992d5f88 Bug 898333, patch 1: Restyle the :after pseudo-element after the content children. r=bzbarsky 2013-09-25 12:28:07 -07:00
Ryan VanderMeulen
cd6b6bc4ae Merge m-c to fx-team. 2013-09-25 14:57:55 -04:00
Ryan VanderMeulen
7be3a6188c Merge m-c to b2g-inbound. 2013-09-25 14:57:08 -04:00
Michael Comella
e647d463c1 Bug 920642: Remove dead files from bug 870171. r=rnewman 2013-09-25 11:52:48 -07:00
Ryan VanderMeulen
57f4628f1d Merge the last PGO-green inbound changeset to m-c. 2013-09-25 14:51:55 -04:00
Fabrice Desré
ceae424e26 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
Ryan VanderMeulen
0c96be1826 Merge fx-team to m-c. 2013-09-25 14:38:02 -04:00
Gaia Pushbot
ccd8d6b904 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
Ryan VanderMeulen
78dc993775 Merge b2g-inbound to m-c. 2013-09-25 14:27:43 -04:00