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.
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.
(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.)
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.
========
https://hg.mozilla.org/integration/gaia-central/rev/df1654f408ae
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 918576 - [B2G][SMS] The text MMS does not appear above the send button when attaching the first attachment r=gnarf
* compose.js: trigger the input event after changing the type
* thread_ui.js: don't do anything in the asynchronous getSegmentInfoForText
callback if the type is not SMS at this point
========
https://hg.mozilla.org/integration/gaia-central/rev/68e5065474a4
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge pull request #12435 from zacc/bug917523"
This reverts commit 3ca1ab7595d79f5a3b8351ed1c2a4fdaa664404b, reversing
changes made to bdb0cbb93224aa1f09afeb9c7a7fc3a66c61d28d.
Joshua Cranmer
Boris Zbarsky
Nicolas B. Pierron
Adam Roach [:abr]
Byron Campen [:bwc]
EKR
L. David Baron
Ryan VanderMeulen
Brian Smith
Frank Yan
Dan Gohman
Brian Hackett
Fernando Jiménez
Gaia Pushbot
Margaret Leibovic