author | Kai-Zhen Li <kli@mozilla.com> |
Wed, 08 Jan 2014 19:04:32 +0800 | |
changeset 162538 | acdb2a60fdaa75d058f63e0ccc2abb695e71eaa8 |
parent 162537 | 7d434e24be3b990be881554e992710e1ceead673 |
child 162539 | b08d38d5c0f6a473bfcca35e74cacd16caf5a8ea |
push id | 25958 |
push user | ryanvm@gmail.com |
push date | Wed, 08 Jan 2014 20:22:21 +0000 |
treeherder | mozilla-central@8988416e489d [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mwu |
bugs | 957514 |
milestone | 29.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/widget/gonk/nsAppShell.cpp +++ b/widget/gonk/nsAppShell.cpp @@ -868,17 +868,17 @@ nsAppShell::Init() NS_ENSURE_SUCCESS(rv, rv); InitGonkMemoryPressureMonitoring(); if (XRE_GetProcessType() == GeckoProcessType_Default) { #ifdef MOZ_OMX_DECODER android::MediaResourceManagerService::instantiate(); #endif -#if ANDROID_VERSION >= 18 +#if ANDROID_VERSION >= 18 && (defined(MOZ_OMX_DECODER) || defined(MOZ_B2G_CAMERA)) android::FakeSurfaceComposer::instantiate(); #endif GonkPermissionService::instantiate(); } nsCOMPtr<nsIObserverService> obsServ = GetObserverService(); if (obsServ) { obsServ->AddObserver(this, "browser-ui-startup-complete", false);