Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-01 08:42:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Put meta viewport support behind a pref (bug 1092450, r=kats).

Browse Source
This commit is contained in:
David Anderson 2014-11-21 14:32:32 -05:00
parent 3cd3e496aa
commit a7ce0b61d2
6 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/app/b2g.js
View File

@ -434,6 +434,8 @@ pref("dom.ipc.processCount", 100000);
pref("dom.ipc.browser_frames.oop_by_default", false);
pref("dom.meta-viewport.enabled", true);
// SMS/MMS
pref("dom.sms.enabled", true);

7
dom/base/nsDocument.cpp
View File

@ -7758,6 +7758,13 @@ nsDocument::GetViewportInfo(const ScreenIntSize& aDisplaySize)
CSSToScreenScale defaultScale = layoutDeviceScale
* LayoutDeviceToScreenScale(1.0);
if (!Preferences::GetBool("dom.meta-viewport.enabled", false)) {
return nsViewportInfo(aDisplaySize,
defaultScale,
/*allowZoom*/ false,
/*allowDoubleTapZoom*/ true);
}
// In cases where the width of the CSS viewport is less than or equal to the width
// of the display (i.e. width <= device-width) then we disable double-tap-to-zoom
// behaviour. See bug 941995 for details.

7
dom/base/test/mochitest.ini
View File

@ -684,12 +684,19 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 775227
[test_ipc_messagemanager_blob.html]
skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 936226
[test_meta_viewport0.html]
skip-if = buildapp != 'b2g' # meta-viewport tag support is only on b2g
[test_meta_viewport1.html]
skip-if = buildapp != 'b2g' # meta-viewport tag support is only on b2g
[test_meta_viewport2.html]
skip-if = buildapp != 'b2g' # meta-viewport tag support is only on b2g
[test_meta_viewport3.html]
skip-if = buildapp != 'b2g' # meta-viewport tag support is only on b2g
[test_meta_viewport4.html]
skip-if = buildapp != 'b2g' # meta-viewport tag support is only on b2g
[test_meta_viewport5.html]
skip-if = buildapp != 'b2g' # meta-viewport tag support is only on b2g
[test_meta_viewport6.html]
skip-if = buildapp != 'b2g' # meta-viewport tag support is only on b2g
[test_mozfiledataurl.html]
skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT
[test_mozMatchesSelector.html]

2
layout/generic/crashtests/crashtests.list
View File

@ -473,7 +473,7 @@ load 737313-2.html
load 737313-3.html
load 747688.html
load 750066.html
test-pref(font.size.inflation.emPerLine,15) asserts-if(!browserIsRemote,1-100) load font-inflation-762332.html # bug 762332
pref(dom.meta-viewport.enabled,true) test-pref(font.size.inflation.emPerLine,15) asserts-if(!browserIsRemote,1-100) load font-inflation-762332.html # bug 762332
load 762902.html
load 762764-1.html
load 765409.html

9
layout/reftests/font-inflation/reftest.list
View File

@ -5,6 +5,12 @@
# with the lineThreshold preference explicitly set to zero. However,
# newer tests should probably focus more on testing nonzero values of
# that preference.
# The font-inflation code uses the meta-viewport tag as one of its inputs
# when determining if font-inflation needs to be applied, so enable it for
# these tests.
default-preferences pref(dom.meta-viewport.enabled,true)
test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) test-pref(font.size.inflation.maxRatio,200) == maxRatio-1.html maxRatio-1-ref.html
test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == text-1.html text-1-ref.html
test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == text-2.html text-2-ref.html
@ -100,3 +106,6 @@ test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceE
pref(font.size.inflation.emPerLine,15) pref(font.size.inflation.forceEnabled,true) pref(font.size.inflation.lineThreshold,0) == min-width-passes-1.html min-width-passes-1-ref.html
pref(font.size.inflation.emPerLine,15) pref(font.size.inflation.forceEnabled,true) == xul-reflow-1.html xul-reflow-1-ref.html
# reset the default preferences
default-preferences

3
modules/libpref/init/all.js
View File

@ -4415,3 +4415,6 @@ pref("dom.beforeAfterKeyboardEvent.enabled", false);
#ifdef XP_MACOSX
pref("intl.collation.mac.use_icu", true);
#endif
// Enable meta-viewport support in remote APZ-enabled frames.
pref("dom.meta-viewport.enabled", false);