Bug 978495:  Initialize mozilla::layers::TextureClientX11::mLocked.  r=nical
Bug 687297 - The per-presentation base minimum font size is now propagated without being max’ed with the language-specific global minimum font size preference, r=dbaron

A separate accessor has been added to nsPresContext to enable TransferZoomLevels and nsDocumentViewer::GetMinFontSize to access the minimum font size that has not been max’ed against the language specific minimum font size preset.

nsPresContext::mMinFontSize, its getter, and its setter have been renamed to more clearly distinguish them from minFontSize used elsewhere.
Bug 687297 - Added Mochitest to verify that the per-presentation base minimum font size is propagated without being influenced by the language-specific global preference.  r=dbaron

This test applies a large value to the font.minimum-size.ja preference, opens a new window, advances the url through an iso-8859-1 page, a Shift-JIS page, and back to an iso-8859-1 page.  If the height of a div containing text on the first iso-8859-1 page and last iso-8859-1 page do not match, then the test is failed.

This test has been excluded from B2G Desktop Client tests due to bug 948948.
Automatic merge