Backed out changeset 8ff54001c29a (bug 1178847)

This commit is contained in:
Carsten "Tomcat" Book 2015-07-21 08:34:51 +02:00
parent 8c643f1407
commit 4e130a4f19
2 changed files with 0 additions and 7 deletions

View File

@ -4,8 +4,6 @@
#filter substitution #filter substitution
// For the all MOZ_MULET ifdef conditions in this file: see bug 1174234
#ifndef MOZ_MULET #ifndef MOZ_MULET
pref("toolkit.defaultChromeURI", "chrome://b2g/content/shell.html"); pref("toolkit.defaultChromeURI", "chrome://b2g/content/shell.html");
pref("browser.chromeURL", "chrome://b2g/content/"); pref("browser.chromeURL", "chrome://b2g/content/");
@ -459,9 +457,7 @@ pref("dom.ipc.processCount", 100000);
pref("dom.ipc.browser_frames.oop_by_default", false); pref("dom.ipc.browser_frames.oop_by_default", false);
#ifndef MOZ_MULET
pref("dom.meta-viewport.enabled", true); pref("dom.meta-viewport.enabled", true);
#endif
// SMS/MMS // SMS/MMS
pref("dom.sms.enabled", true); pref("dom.sms.enabled", true);

View File

@ -984,12 +984,9 @@ PresShell::Init(nsIDocument* aDocument,
if (mPresContext->IsRootContentDocument()) { if (mPresContext->IsRootContentDocument()) {
mZoomConstraintsClient = new ZoomConstraintsClient(); mZoomConstraintsClient = new ZoomConstraintsClient();
mZoomConstraintsClient->Init(this, mDocument); mZoomConstraintsClient->Init(this, mDocument);
#ifndef MOZ_WIDGET_ANDROID
// Fennec will need some work to use this code; see bug 1180267.
if (gfxPrefs::MetaViewportEnabled()) { if (gfxPrefs::MetaViewportEnabled()) {
mMobileViewportManager = new MobileViewportManager(this, mDocument); mMobileViewportManager = new MobileViewportManager(this, mDocument);
} }
#endif
} }
} }