Bug 1049501: Don't let the GMPThread event loop recurse while handling IPDL shutdowns r=bsmedberg
Bug 1051895 - Make mozdevice docs a bit easier to navigate;r=bc DONTBUILD NPOTB
Backed out changeset 2322a7c26246 (bug 1049501) for Windows bustage.
Backed out changesets 9329fb07c373 and ff8dc9ac0228 (bug 1022501) for Windows mochitest-1 failures.
CLOSED TREE

--HG--
rename : content/media/fmp4/eme/EMEAudioDecoder.cpp => content/media/fmp4/eme/EMEAACDecoder.cpp
rename : content/media/fmp4/eme/EMEAudioDecoder.h => content/media/fmp4/eme/EMEAACDecoder.h
rename : content/media/fmp4/ffmpeg/FFmpegAudioDecoder.cpp => content/media/fmp4/ffmpeg/FFmpegAACDecoder.cpp
rename : content/media/fmp4/ffmpeg/FFmpegAudioDecoder.h => content/media/fmp4/ffmpeg/FFmpegAACDecoder.h
Bug 1053616: Remove uses of PR_SetError from mozilla::pkix tests, r=keeler

--HG--
extra : rebase_source : 1fc7ce9ab400c39e3c4afb68940be93cc2a0b848
Bug 1053617: Reduce scope of DER encoding debugging logic to the file it is used in, r=keeler

--HG--
extra : rebase_source : c22f7e96dfdd1997626769ac03c6d189321eec1a
Bug 1053620: Replaces uses of PR_Abort with std::abort in mozilla::pkix, r=keeler

--HG--
extra : rebase_source : 2e1f3eec5305e89bfa28fbda856b4e36515a2819
Bug 1053621: Stop using PR_NOT_REACHED in mozilla::pkix, r=keeler

--HG--
extra : rebase_source : b70a3ca2f3dade0439cf902bf4042716e7d1bbd3
Bug 1053627, Part 1: use sizeof instead of PR_ARRAY_SIZE for byte arrays, r=keeler

--HG--
extra : rebase_source : a01364ed6b64800142f18d3d350f50ca178ea4bb
Bug 1053627, Part 2: Use MOZILLA_PKIX_ARRAY_LENGTH instead of PR_ARRAY_SIZE, r=keeler

--HG--
extra : rebase_source : b9ae99d93921cb2f3a8f4395e9240389752fd2de
Bug 1030993 - Basic reflow implementation for ruby frame classes. r=dbaron

To account for spacing between bases or text boxes during reflow, the line
layout which manages the bases updates its inline direction coordinate based on
the preferred inline size for the corresponding text boxes. Next, the base is
reflowed at the correct inline coordinate. Each paired text box is then also
reflowed at the proper inline position determined by (1) the current position of
its corresponding base and (2) its own preferred width.

In computing intrinsic widths, accounting for spacing is less complicated. The
minimum intrinsic width is the width of the widest ruby column, and the
preferred intrinsic width is the sum of all the ruby column widths. Each ruby
column width is the maximum width of its base box and text boxes. These
individual widths are determined using GetPrefISize on the base and text boxes.

Ruby base container frames store a list of pointers to the ruby text container
frames in the segment they denote. This list of pointers is created in the ruby
frame reflow method before calling the reflow method for the ruby base
container. The list exists and is used only during reflow of the main ruby frame
and is cleared before returning from reflow.
Bug 1039017 - Reftests for ruby whitespace handling. r=dholbert
Bug 1030993 - Fix assertion failure in reftest css-ruby/ruby-whitespace-1.html. r=dbaron

Fixes the assertion failure with text:
"###!!! ASSERTION: Wrong line container
hint: '!aForFrame || (aLineContainer == FindLineContainer(aForFrame) ||
aLineContainer->GetType() == nsGkAtoms::rubyTextContainerFrame ||
(aLineContainer->GetType() == nsGkAtoms::letterFrame &&
aLineContainer->IsFloating()))', file
/home/sgbowen/builds/mozilla-central/layout/generic/nsTextFrame.cpp, line 1259"
which occasionally appears when opening pages with ruby or when running ruby
reftests.

Updates the manifest for ruby reftests to the current expectations (adjust
assertion counts, etc.)
Bug 1030993 - Reftests for Ruby reflow implementation.r=dbaron
Bug 1030993 followup - Annotate ruby reftests directory as skip-if(B2G), pending investigation on followup bug.
Bug 1037358 - Pass the flag in setDataPointer() to indicate whether data is memory-mapped., r=Waldo
Bug 1047568: fix typo in one of the addresses (r=me)
Backout bug 1038243 for not actually helping.
Bug 1051982 - fix integer prefix to encode Header Table Size Update r=hurley
Bug 1052090 - Don't try to compute main-thread-ness until after we're done with cancel shenanigans. r=bkelly