corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1178847 - Don't use the MobileViewportManager code on Mulet or Fennec yet. r=botond

Browse Source
This commit is contained in:
Kartikaya Gupta
2015-07-21 10:52:11 -04:00
parent 064fc767ff
commit f0368036ee
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
b2g/app/b2g.js
View File

@@ -4,6 +4,8 @@
#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/");
@@ -457,7 +459,9 @@ 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);

3
layout/base/nsPresShell.cpp
View File

@@ -984,9 +984,12 @@ 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
} }
} }