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

Merge mozilla-central and b2g-inbound

Browse Source
This commit is contained in:
Ed Morley 2014-06-19 17:20:14 +01:00
commit 798f1d2efc
25 changed files with 442 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
b2g/config/emulator-ics/sources.xml
View File

@ -19,13 +19,13 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="135a13ea0ee333314b6a12cb19f18617308a3b46"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="7e0ee26ab10fe5d831d58a0398733676bd6d2381"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="44b04243e31cd16f3baf54fcd4b5fecf9deb8b94"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
<project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="3326b51017252e09ccdd715dec6c5e12a7d1ecfe"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="c510babaf88dfa2cfe2c202afb2649ee124569af"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="26e84ee3e9ef5df2ca28b16aa6719c6e77b5f24f"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="51a7017f89df5c775c0c61ee984957bab198f81e"/>
<!-- Stock Android things -->
<project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
<project name="platform/bionic" path="bionic" revision="c72b8f6359de7ed17c11ddc9dfdde3f615d188a9"/>
@ -98,7 +98,7 @@
<project name="platform/system/vold" path="system/vold" revision="919829940468066a32f403980b43f6ebfee5d314"/>
<!-- Emulator specific things -->
<project name="android-development" path="development" remote="b2g" revision="9abf0ab68376afae3e1c7beefa3e9cbee2fde202"/>
<project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="2fee3bbbfc236b883ef8507e27d88b17b203fe25"/>
<project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="3cae7eee1f7f00ba1eb53c733a8779f345055c6e"/>
<project name="platform/external/iproute2" path="external/iproute2" revision="c66c5716d5335e450f7a7b71ccc6a604fb2f41d2"/>
<project name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="d2685281e2e54ca14d1df304867aa82c37b27162"/>
<project name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="627f9b20fc518937b93747a7ff1ed4f5ed46e06f"/>

4
b2g/config/emulator-jb/sources.xml
View File

@ -17,10 +17,10 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="135a13ea0ee333314b6a12cb19f18617308a3b46"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="7e0ee26ab10fe5d831d58a0398733676bd6d2381"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="44b04243e31cd16f3baf54fcd4b5fecf9deb8b94"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="c510babaf88dfa2cfe2c202afb2649ee124569af"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="26e84ee3e9ef5df2ca28b16aa6719c6e77b5f24f"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="51a7017f89df5c775c0c61ee984957bab198f81e"/>
<project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
<project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
<!-- Stock Android things -->

4
b2g/config/emulator-kk/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="135a13ea0ee333314b6a12cb19f18617308a3b46"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="7e0ee26ab10fe5d831d58a0398733676bd6d2381"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="44b04243e31cd16f3baf54fcd4b5fecf9deb8b94"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
@ -23,7 +23,7 @@
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
<project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="26e84ee3e9ef5df2ca28b16aa6719c6e77b5f24f"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="51a7017f89df5c775c0c61ee984957bab198f81e"/>
<!-- Stock Android things -->
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="f92a936f2aa97526d4593386754bdbf02db07a12"/>
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="6e47ff2790f5656b5b074407829ceecf3e6188c4"/>

6
b2g/config/emulator/sources.xml
View File

@ -19,13 +19,13 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="135a13ea0ee333314b6a12cb19f18617308a3b46"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="7e0ee26ab10fe5d831d58a0398733676bd6d2381"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="44b04243e31cd16f3baf54fcd4b5fecf9deb8b94"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
<project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="3326b51017252e09ccdd715dec6c5e12a7d1ecfe"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="c510babaf88dfa2cfe2c202afb2649ee124569af"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="26e84ee3e9ef5df2ca28b16aa6719c6e77b5f24f"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="51a7017f89df5c775c0c61ee984957bab198f81e"/>
<!-- Stock Android things -->
<project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
<project name="platform/bionic" path="bionic" revision="c72b8f6359de7ed17c11ddc9dfdde3f615d188a9"/>
@ -98,7 +98,7 @@
<project name="platform/system/vold" path="system/vold" revision="919829940468066a32f403980b43f6ebfee5d314"/>
<!-- Emulator specific things -->
<project name="android-development" path="development" remote="b2g" revision="9abf0ab68376afae3e1c7beefa3e9cbee2fde202"/>
<project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="2fee3bbbfc236b883ef8507e27d88b17b203fe25"/>
<project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="3cae7eee1f7f00ba1eb53c733a8779f345055c6e"/>
<project name="platform/external/iproute2" path="external/iproute2" revision="c66c5716d5335e450f7a7b71ccc6a604fb2f41d2"/>
<project name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="d2685281e2e54ca14d1df304867aa82c37b27162"/>
<project name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="627f9b20fc518937b93747a7ff1ed4f5ed46e06f"/>

4
b2g/config/flame/sources.xml
View File

@ -17,10 +17,10 @@
</project>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="135a13ea0ee333314b6a12cb19f18617308a3b46"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="7e0ee26ab10fe5d831d58a0398733676bd6d2381"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="44b04243e31cd16f3baf54fcd4b5fecf9deb8b94"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="c510babaf88dfa2cfe2c202afb2649ee124569af"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="26e84ee3e9ef5df2ca28b16aa6719c6e77b5f24f"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="51a7017f89df5c775c0c61ee984957bab198f81e"/>
<project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
<project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
<!-- Stock Android things -->

2
b2g/config/gaia.json
View File

@ -4,6 +4,6 @@
"remote": "",
"branch": ""
},
"revision": "507ca54e4c4da9d3e1b1af92d7a306a71875d066",
"revision": "a5c2e2bdbd7f60637b74b862567eb298aaf80fb1",
"repo_path": "/integration/gaia-central"
}

4
b2g/config/hamachi/sources.xml
View File

@ -17,12 +17,12 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="135a13ea0ee333314b6a12cb19f18617308a3b46"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="7e0ee26ab10fe5d831d58a0398733676bd6d2381"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="44b04243e31cd16f3baf54fcd4b5fecf9deb8b94"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="c510babaf88dfa2cfe2c202afb2649ee124569af"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="26e84ee3e9ef5df2ca28b16aa6719c6e77b5f24f"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="51a7017f89df5c775c0c61ee984957bab198f81e"/>
<!-- Stock Android things -->
<project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
<project name="platform/bionic" path="bionic" revision="d2eb6c7b6e1bc7643c17df2d9d9bcb1704d0b9ab"/>

2
b2g/config/helix/sources.xml
View File

@ -15,7 +15,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="135a13ea0ee333314b6a12cb19f18617308a3b46"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="7e0ee26ab10fe5d831d58a0398733676bd6d2381"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="44b04243e31cd16f3baf54fcd4b5fecf9deb8b94"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

4
b2g/config/nexus-4/sources.xml
View File

@ -17,10 +17,10 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="135a13ea0ee333314b6a12cb19f18617308a3b46"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="7e0ee26ab10fe5d831d58a0398733676bd6d2381"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="44b04243e31cd16f3baf54fcd4b5fecf9deb8b94"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="c510babaf88dfa2cfe2c202afb2649ee124569af"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="26e84ee3e9ef5df2ca28b16aa6719c6e77b5f24f"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="51a7017f89df5c775c0c61ee984957bab198f81e"/>
<project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
<project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
<!-- Stock Android things -->

4
b2g/config/wasabi/sources.xml
View File

@ -17,12 +17,12 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="135a13ea0ee333314b6a12cb19f18617308a3b46"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="7e0ee26ab10fe5d831d58a0398733676bd6d2381"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="44b04243e31cd16f3baf54fcd4b5fecf9deb8b94"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="c510babaf88dfa2cfe2c202afb2649ee124569af"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="26e84ee3e9ef5df2ca28b16aa6719c6e77b5f24f"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="51a7017f89df5c775c0c61ee984957bab198f81e"/>
<project name="gonk-patches" path="patches" remote="b2g" revision="223a2421006e8f5da33f516f6891c87cae86b0f6"/>
<!-- Stock Android things -->
<project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>

22
dom/apps/src/Webapps.jsm
View File

@ -616,12 +616,13 @@ this.DOMApplicationRegistry = {
}.bind(this)).then(null, Cu.reportError);
},
updateDataStore: function(aId, aOrigin, aManifestURL, aManifest, aAppStatus) {
// Just Certified Apps can use DataStores
let prefName = "dom.testing.datastore_enabled_for_hosted_apps";
if (aAppStatus != Ci.nsIPrincipal.APP_STATUS_CERTIFIED &&
(Services.prefs.getPrefType(prefName) == Services.prefs.PREF_INVALID ||
!Services.prefs.getBoolPref(prefName))) {
updateDataStore: function(aId, aOrigin, aManifestURL, aManifest) {
let uri = Services.io.newURI(aOrigin, null, null);
let secMan = Cc["@mozilla.org/scriptsecuritymanager;1"]
.getService(Ci.nsIScriptSecurityManager);
let principal = secMan.getAppCodebasePrincipal(uri, aId,
/*mozbrowser*/ false);
if (!dataStoreService.checkPermission(principal)) {
return;
}
@ -1543,7 +1544,7 @@ this.DOMApplicationRegistry = {
true);
}
this.updateDataStore(this.webapps[id].localId, app.origin,
app.manifestURL, newManifest, app.appStatus);
app.manifestURL, newManifest);
this.broadcastMessage("Webapps:UpdateState", {
app: app,
manifest: newManifest,
@ -1961,7 +1962,7 @@ this.DOMApplicationRegistry = {
}
this.updateDataStore(this.webapps[aId].localId, aApp.origin,
aApp.manifestURL, aApp.manifest, aApp.appStatus);
aApp.manifestURL, aApp.manifest);
aApp.name = manifest.name;
aApp.csp = manifest.csp || "";
@ -2494,8 +2495,7 @@ this.DOMApplicationRegistry = {
}
this.updateDataStore(this.webapps[id].localId, this.webapps[id].origin,
this.webapps[id].manifestURL, jsonManifest,
this.webapps[id].appStatus);
this.webapps[id].manifestURL, jsonManifest);
}
for each (let prop in ["installState", "downloadAvailable", "downloading",
@ -2631,7 +2631,7 @@ this.DOMApplicationRegistry = {
}
this.updateDataStore(this.webapps[aId].localId, aNewApp.origin,
aNewApp.manifestURL, aManifest, aNewApp.appStatus);
aNewApp.manifestURL, aManifest);
this.broadcastMessage("Webapps:UpdateState", {
app: app,

20
dom/base/Navigator.cpp
View File

@ -2264,25 +2264,7 @@ Navigator::HasDataStoreSupport(nsIPrincipal* aPrincipal)
{
workers::AssertIsOnMainThread();
// First of all, the general pref has to be turned on.
bool enabled = false;
Preferences::GetBool("dom.datastore.enabled", &enabled);
if (!enabled) {
return false;
}
// Just for testing, we can enable DataStore for any kind of app.
if (Preferences::GetBool("dom.testing.datastore_enabled_for_hosted_apps", false)) {
return true;
}
uint16_t status;
if (NS_FAILED(aPrincipal->GetAppStatus(&status))) {
return false;
}
// Only support DataStore API for certified apps for now.
return status == nsIPrincipal::APP_STATUS_CERTIFIED;
return DataStoreService::CheckPermission(aPrincipal);
}
// A WorkerMainThreadRunnable to synchronously dispatch the call of

243
dom/camera/CameraPreferences.cpp Normal file
View File

@ -0,0 +1,243 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "CameraPreferences.h"
#include "CameraCommon.h"
#include "mozilla/Monitor.h"
#include "mozilla/StaticPtr.h"
#include "mozilla/Preferences.h"
using namespace mozilla;
/* statics */
static StaticAutoPtr<Monitor> sPrefMonitor;
StaticAutoPtr<nsCString> CameraPreferences::sPrefTestEnabled;
StaticAutoPtr<nsCString> CameraPreferences::sPrefHardwareTest;
StaticAutoPtr<nsCString> CameraPreferences::sPrefGonkParameters;
nsresult CameraPreferences::sPrefCameraControlMethodErrorOverride = NS_OK;
nsresult CameraPreferences::sPrefCameraControlAsyncErrorOverride = NS_OK;
/* static */
nsresult
CameraPreferences::UpdatePref(const char* aPref, nsresult& aVal)
{
uint32_t val;
nsresult rv = Preferences::GetUint(aPref, &val);
if (NS_SUCCEEDED(rv)) {
aVal = static_cast<nsresult>(val);
}
return rv;
}
/* static */
nsresult
CameraPreferences::UpdatePref(const char* aPref, nsACString& aVal)
{
nsCString val;
nsresult rv = Preferences::GetCString(aPref, &val);
if (NS_SUCCEEDED(rv)) {
aVal = val;
}
return rv;
}
/* static */
CameraPreferences::Pref CameraPreferences::sPrefs[] = {
{
"camera.control.test.enabled",
kPrefValueIsCString,
{ &sPrefTestEnabled }
},
{
"camera.control.test.hardware",
kPrefValueIsCString,
{ &sPrefHardwareTest }
},
#ifdef MOZ_B2G
{
"camera.control.test.hardware.gonk.parameters",
kPrefValueIsCString,
{ &sPrefGonkParameters }
},
#endif
{
"camera.control.test.method.error",
kPrefValueIsNSResult,
{ &sPrefCameraControlMethodErrorOverride }
},
{
"camera.control.test.async.error",
kPrefValueIsNSResult,
{ &sPrefCameraControlAsyncErrorOverride }
},
};
/* static */
uint32_t
CameraPreferences::PrefToIndex(const char* aPref)
{
for (uint32_t i = 0; i < ArrayLength(sPrefs); ++i) {
if (strcmp(aPref, sPrefs[i].mPref) == 0) {
return i;
}
}
return kPrefNotFound;
}
/* static */
void
CameraPreferences::PreferenceChanged(const char* aPref, void* aClosure)
{
MonitorAutoLock mon(*sPrefMonitor);
uint32_t i = PrefToIndex(aPref);
if (i == kPrefNotFound) {
DOM_CAMERA_LOGE("Preference '%s' is not tracked by CameraPreferences\n", aPref);
return;
}
Pref& p = sPrefs[i];
nsresult rv;
switch (p.mValueType) {
case kPrefValueIsNSResult:
{
nsresult& v = *p.mValue.mAsNsResult;
rv = UpdatePref(aPref, v);
if (NS_SUCCEEDED(rv)) {
DOM_CAMERA_LOGI("Preference '%s' has changed, 0x%x\n", aPref, v);
}
}
break;
case kPrefValueIsCString:
{
nsCString& v = **p.mValue.mAsCString;
rv = UpdatePref(aPref, v);
if (NS_SUCCEEDED(rv)) {
DOM_CAMERA_LOGI("Preference '%s' has changed, '%s'\n", aPref, v.get());
}
}
break;
default:
MOZ_ASSERT_UNREACHABLE("Unhandled preference value type!");
return;
}
#ifdef DEBUG
if (NS_FAILED(rv)) {
nsCString msg;
msg.AppendPrintf("Failed to update pref '%s' (0x%x)\n", aPref, rv);
NS_WARNING(msg.get());
}
#endif
}
/* static */
bool
CameraPreferences::Initialize()
{
DOM_CAMERA_LOGI("Initializing camera preference callbacks\n");
nsresult rv;
sPrefMonitor = new Monitor("CameraPreferences.sPrefMonitor");
sPrefTestEnabled = new nsCString();
sPrefHardwareTest = new nsCString();
sPrefGonkParameters = new nsCString();
for (uint32_t i = 0; i < ArrayLength(sPrefs); ++i) {
rv = Preferences::RegisterCallbackAndCall(CameraPreferences::PreferenceChanged,
sPrefs[i].mPref);
if (NS_WARN_IF(NS_FAILED(rv))) {
return false;
}
}
DOM_CAMERA_LOGI("Camera preferences initialized\n");
return true;
}
/* static */
void
CameraPreferences::Shutdown()
{
DOM_CAMERA_LOGI("Shutting down camera preference callbacks\n");
for (uint32_t i = 0; i < ArrayLength(sPrefs); ++i) {
Preferences::UnregisterCallback(CameraPreferences::PreferenceChanged,
sPrefs[i].mPref);
}
sPrefTestEnabled = nullptr;
sPrefHardwareTest = nullptr;
sPrefGonkParameters = nullptr;
sPrefMonitor = nullptr;
DOM_CAMERA_LOGI("Camera preferences shut down\n");
}
/* static */
bool
CameraPreferences::GetPref(const char* aPref, nsACString& aVal)
{
MOZ_ASSERT(sPrefMonitor, "sPrefMonitor missing in CameraPreferences::GetPref()");
MonitorAutoLock mon(*sPrefMonitor);
uint32_t i = PrefToIndex(aPref);
if (i == kPrefNotFound || i >= ArrayLength(sPrefs)) {
DOM_CAMERA_LOGW("Preference '%s' is not tracked by CameraPreferences\n", aPref);
return false;
}
if (sPrefs[i].mValueType != kPrefValueIsCString) {
DOM_CAMERA_LOGW("Preference '%s' is not a string type\n", aPref);
return false;
}
StaticAutoPtr<nsCString>* s = sPrefs[i].mValue.mAsCString;
if (!*s) {
DOM_CAMERA_LOGE("Preference '%s' cache is not initialized\n", aPref);
return false;
}
if ((*s)->IsEmpty()) {
DOM_CAMERA_LOGI("Preference '%s' is not set\n", aPref);
return false;
}
DOM_CAMERA_LOGI("Preference '%s', got '%s'\n", aPref, (*s)->get());
aVal = **s;
return true;
}
/* static */
bool
CameraPreferences::GetPref(const char* aPref, nsresult& aVal)
{
MOZ_ASSERT(sPrefMonitor, "sPrefMonitor missing in CameraPreferences::GetPref()");
MonitorAutoLock mon(*sPrefMonitor);
uint32_t i = PrefToIndex(aPref);
if (i == kPrefNotFound || i >= ArrayLength(sPrefs)) {
DOM_CAMERA_LOGW("Preference '%s' is not tracked by CameraPreferences\n", aPref);
return false;
}
if (sPrefs[i].mValueType != kPrefValueIsNSResult) {
DOM_CAMERA_LOGW("Preference '%s' is not an nsresult type\n", aPref);
return false;
}
nsresult v = *sPrefs[i].mValue.mAsNsResult;
if (v == NS_OK) {
DOM_CAMERA_LOGI("Preference '%s' is not set\n", aPref);
return false;
}
DOM_CAMERA_LOGI("Preference '%s', got 0x%x\n", aPref, v);
aVal = v;
return true;
}

67
dom/camera/CameraPreferences.h Normal file
View File

@ -0,0 +1,67 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef DOM_CAMERA_CAMERAPREFERENCES_H
#define DOM_CAMERA_CAMERAPREFERENCES_H
#include "nsString.h"
namespace mozilla {
template<class T> class StaticAutoPtr;
class CameraPreferences
{
public:
static bool Initialize();
static void Shutdown();
static bool GetPref(const char* aPref, nsACString& aVal);
static bool GetPref(const char* aPref, nsresult& aVal);
protected:
static const uint32_t kPrefNotFound = UINT32_MAX;
static uint32_t PrefToIndex(const char* aPref);
static void PreferenceChanged(const char* aPref, void* aClosure);
static nsresult UpdatePref(const char* aPref, nsresult& aVar);
static nsresult UpdatePref(const char* aPref, nsACString& aVar);
enum PrefValueType {
kPrefValueIsNSResult,
kPrefValueIsCString
};
struct Pref {
const char* const mPref;
PrefValueType mValueType;
union {
// The 'mAsVoid' member must be first and is required to allow 'mValue'
// to be initialized with any pointer type, as not all of our platforms
// support the use of designated initializers; in their absence, only
// the first element of a union can be statically initialized, and
// 'void*' lets us stuff any pointer type into it.
void* mAsVoid;
StaticAutoPtr<nsCString>* mAsCString;
nsresult* mAsNsResult;
} mValue;
};
static Pref sPrefs[];
static StaticAutoPtr<nsCString> sPrefTestEnabled;
static StaticAutoPtr<nsCString> sPrefHardwareTest;
static StaticAutoPtr<nsCString> sPrefGonkParameters;
static nsresult sPrefCameraControlMethodErrorOverride;
static nsresult sPrefCameraControlAsyncErrorOverride;
private:
// static class only
CameraPreferences();
~CameraPreferences();
};
} // namespace mozilla
#endif // DOM_CAMERA_CAMERAPREFERENCES_H

6
dom/camera/GonkCameraHwMgr.cpp
View File

@ -23,7 +23,7 @@
#include "base/basictypes.h"
#include "nsDebug.h"
#include "mozilla/layers/TextureClient.h"
#include "mozilla/Preferences.h"
#include "CameraPreferences.h"
#include "mozilla/RefPtr.h"
#include "GonkCameraControl.h"
#include "GonkNativeWindow.h"
@ -212,8 +212,8 @@ GonkCameraHardware::Connect(mozilla::nsGonkCameraControl* aTarget, uint32_t aCam
return nullptr;
}
const nsAdoptingCString& test =
mozilla::Preferences::GetCString("camera.control.test.enabled");
nsCString test;
CameraPreferences::GetPref("camera.control.test.enabled", test);
sp<GonkCameraHardware> cameraHardware;
if (test.EqualsASCII("hardware")) {
NS_WARNING("Using test Gonk hardware layer");

7
dom/camera/GonkCameraManager.cpp
View File

@ -20,7 +20,7 @@
#include "CameraCommon.h"
#include "GonkCameraControl.h"
#include "mozilla/Preferences.h"
#include "CameraPreferences.h"
#include "TestGonkCameraControl.h"
using namespace mozilla;
@ -117,13 +117,12 @@ ICameraControl::GetListOfCameras(nsTArray<nsString>& aList)
return NS_OK;
}
static const char* sTestModeEnabled = "camera.control.test.enabled";
// implementation-specific camera factory
already_AddRefed<ICameraControl>
ICameraControl::Create(uint32_t aCameraId)
{
const nsAdoptingCString& test = Preferences::GetCString(sTestModeEnabled);
nsCString test;
CameraPreferences::GetPref("camera.control.test.enabled", test);
nsRefPtr<nsGonkCameraControl> control;
if (test.EqualsASCII("control")) {
NS_WARNING("Using test CameraControl layer");

15
dom/camera/TestGonkCameraControl.cpp
View File

@ -15,13 +15,10 @@
*/
#include "TestGonkCameraControl.h"
#include "mozilla/Preferences.h"
#include "CameraPreferences.h"
using namespace mozilla;
static const char* sMethodErrorOverride = "camera.control.test.method.error";
static const char* sAsyncErrorOverride = "camera.control.test.async.error";
TestGonkCameraControl::TestGonkCameraControl(uint32_t aCameraId)
: nsGonkCameraControl(aCameraId)
{
@ -37,9 +34,8 @@ TestGonkCameraControl::~TestGonkCameraControl()
nsresult
TestGonkCameraControl::ForceMethodFailWithCodeInternal(const char* aFile, int aLine)
{
nsresult rv =
static_cast<nsresult>(Preferences::GetInt(sMethodErrorOverride,
static_cast<int32_t>(NS_OK)));
nsresult rv = NS_OK;
CameraPreferences::GetPref("camera.control.test.method.error", rv);
if (NS_FAILED(rv)) {
DOM_CAMERA_LOGI("[%s:%d] CameraControl method error override: 0x%x\n",
aFile, aLine, rv);
@ -50,9 +46,8 @@ TestGonkCameraControl::ForceMethodFailWithCodeInternal(const char* aFile, int aL
nsresult
TestGonkCameraControl::ForceAsyncFailWithCodeInternal(const char* aFile, int aLine)
{
nsresult rv =
static_cast<nsresult>(Preferences::GetInt(sAsyncErrorOverride,
static_cast<int32_t>(NS_OK)));
nsresult rv = NS_OK;
CameraPreferences::GetPref("camera.control.test.async.error", rv);
if (NS_FAILED(rv)) {
DOM_CAMERA_LOGI("[%s:%d] CameraControl async error override: 0x%x\n",
aFile, aLine, rv);

8
dom/camera/TestGonkCameraHardware.cpp
View File

@ -16,7 +16,7 @@
#include "TestGonkCameraHardware.h"
#include "mozilla/Preferences.h"
#include "CameraPreferences.h"
#include "nsThreadUtils.h"
using namespace android;
@ -52,7 +52,8 @@ TestGonkCameraHardware::Init()
const nsCString
TestGonkCameraHardware::TestCase()
{
const nsCString test = Preferences::GetCString("camera.control.test.hardware");
nsCString test;
CameraPreferences::GetPref("camera.control.test.hardware", test);
return test;
}
@ -77,7 +78,8 @@ TestGonkCameraHardware::GetExtraParameters()
* may contain equals signs or semicolons. We don't enforce that here
* so that we can also test correct handling of improperly-formatted values.
*/
const nsCString parameters = Preferences::GetCString("camera.control.test.hardware.gonk.parameters");
nsCString parameters;
CameraPreferences::GetPref("camera.control.test.hardware.gonk.parameters", parameters);
DOM_CAMERA_LOGA("TestGonkCameraHardware : extra-parameters '%s'\n",
parameters.get());
return parameters;

4
dom/camera/moz.build
View File

@ -9,13 +9,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
EXPORTS += [
'CameraCommon.h',
'CameraPreviewMediaStream.h',
'CameraPreferences.h',
'DOMCameraManager.h',
'GonkCameraControl.h',
]
SOURCES += [
'CameraControlImpl.cpp',
'CameraPreferences.cpp',
'CameraPreviewMediaStream.cpp',
'CameraRecorderProfiles.cpp',
'DOMCameraCapabilities.cpp',

24
dom/datastore/DataStoreChangeNotifier.jsm
View File

@ -19,6 +19,10 @@ XPCOMUtils.defineLazyServiceGetter(this, "ppmm",
"@mozilla.org/parentprocessmessagemanager;1",
"nsIMessageBroadcaster");
XPCOMUtils.defineLazyServiceGetter(this, "dataStoreService",
"@mozilla.org/datastore-service;1",
"nsIDataStoreService");
this.DataStoreChangeNotifier = {
children: [],
messages: [ "DataStore:Changed", "DataStore:RegisterForMessages",
@ -67,16 +71,20 @@ this.DataStoreChangeNotifier = {
receiveMessage: function(aMessage) {
debug("receiveMessage ");
// No check has to be done when the message is 'child-process-shutdown'
// because at this point the target is already disconnected from
// nsFrameMessageManager, so that assertAppHasStatus will always fail.
let prefName = 'dom.testing.datastore_enabled_for_hosted_apps';
if (aMessage.name != 'child-process-shutdown' &&
(Services.prefs.getPrefType(prefName) == Services.prefs.PREF_INVALID ||
!Services.prefs.getBoolPref(prefName)) &&
!aMessage.target.assertAppHasStatus(Ci.nsIPrincipal.APP_STATUS_CERTIFIED)) {
// No check has to be done when the message is 'child-process-shutdown'.
if (aMessage.name != "child-process-shutdown") {
if (!("principal" in aMessage)) {
return;
}
let secMan = Cc["@mozilla.org/scriptsecuritymanager;1"]
.getService(Ci.nsIScriptSecurityManager);
let uri = Services.io.newURI(aMessage.principal.origin, null, null);
let principal = secMan.getAppCodebasePrincipal(uri,
aMessage.principal.appId, aMessage.principal.isInBrowserElement);
if (!principal || !dataStoreService.checkPermission(principal)) {
return;
}
}
switch (aMessage.name) {
case "DataStore:Changed":

12
dom/datastore/DataStoreImpl.js
View File

@ -100,7 +100,9 @@ DataStore.prototype = {
cpmm.addMessageListener("DataStore:Changed:Return:OK", this);
cpmm.sendAsyncMessage("DataStore:RegisterForMessages",
{ store: this._name, owner: this._owner,
innerWindowID: this._innerWindowID });
innerWindowID: this._innerWindowID },
null,
this._window.document.nodePrincipal);
},
observe: function(aSubject, aTopic, aData) {
@ -110,7 +112,9 @@ DataStore.prototype = {
cpmm.removeMessageListener("DataStore:Changed:Return:OK", this);
cpmm.sendAsyncMessage("DataStore:UnregisterForMessages",
{ innerWindowID: this._innerWindowID });
{ innerWindowID: this._innerWindowID },
null,
this._window.document.nodePrincipal);
this._shuttingdown = true;
this._db.close();
}
@ -336,7 +340,9 @@ DataStore.prototype = {
cpmm.sendAsyncMessage("DataStore:Changed",
{ store: this.name, owner: this._owner,
message: { revisionId: aRevisionId, id: aId,
operation: aOperation, owner: this._owner } } );
operation: aOperation, owner: this._owner } },
null,
this._window.document.nodePrincipal);
},
receiveMessage: function(aMessage) {

54
dom/datastore/DataStoreService.cpp
View File

@ -903,7 +903,7 @@ DataStoreService::GetDataStores(nsIDOMWindow* aWindow,
return NS_OK;
}
rv = GetDataStoreInfos(aName, appId, stores);
rv = GetDataStoreInfos(aName, appId, principal, stores);
if (NS_FAILED(rv)) {
RejectPromise(window, promise, rv);
promise.forget(aDataStores);
@ -1043,6 +1043,7 @@ DataStoreService::GetDataStoresResolve(nsPIDOMWindow* aWindow,
nsresult
DataStoreService::GetDataStoreInfos(const nsAString& aName,
uint32_t aAppId,
nsIPrincipal* aPrincipal,
nsTArray<DataStoreInfo>& aStores)
{
AssertIsInMainProcess();
@ -1064,15 +1065,7 @@ DataStoreService::GetDataStoreInfos(const nsAString& aName,
return NS_ERROR_DOM_SECURITY_ERR;
}
uint16_t status;
rv = app->GetAppStatus(&status);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
if (status != nsIPrincipal::APP_STATUS_CERTIFIED &&
!Preferences::GetBool("dom.testing.datastore_enabled_for_hosted_apps",
false)) {
if (!DataStoreService::CheckPermission(aPrincipal)) {
return NS_ERROR_DOM_SECURITY_ERR;
}
@ -1095,6 +1088,45 @@ DataStoreService::GetDataStoreInfos(const nsAString& aName,
return NS_OK;
}
bool
DataStoreService::CheckPermission(nsIPrincipal* aPrincipal)
{
// First of all, the general pref has to be turned on.
bool enabled = false;
Preferences::GetBool("dom.datastore.enabled", &enabled);
if (!enabled) {
return false;
}
// Just for testing, we can enable DataStore for any kind of app.
if (Preferences::GetBool("dom.testing.datastore_enabled_for_hosted_apps", false)) {
return true;
}
if (!aPrincipal) {
return false;
}
uint16_t status;
if (NS_FAILED(aPrincipal->GetAppStatus(&status))) {
return false;
}
// Only support DataStore API for certified apps for now.
return status == nsIPrincipal::APP_STATUS_CERTIFIED;
}
NS_IMETHODIMP
DataStoreService::CheckPermission(nsIPrincipal* aPrincipal,
bool* aResult)
{
MOZ_ASSERT(NS_IsMainThread());
*aResult = DataStoreService::CheckPermission(aPrincipal);
return NS_OK;
}
// This method is called when an app with DataStores is deleted.
void
DataStoreService::DeleteDataStores(uint32_t aAppId)
@ -1311,7 +1343,7 @@ DataStoreService::GetDataStoresFromIPC(const nsAString& aName,
}
nsTArray<DataStoreInfo> stores;
rv = GetDataStoreInfos(aName, appId, stores);
rv = GetDataStoreInfos(aName, appId, aPrincipal, stores);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}

3
dom/datastore/DataStoreService.h
View File

@ -48,6 +48,8 @@ public:
static void Shutdown();
static bool CheckPermission(nsIPrincipal* principal);
nsresult GenerateUUID(nsAString& aID);
nsresult GetDataStoresFromIPC(const nsAString& aName,
@ -82,6 +84,7 @@ private:
const nsTArray<DataStoreInfo>& aStores);
nsresult GetDataStoreInfos(const nsAString& aName, uint32_t aAppId,
nsIPrincipal* aPrincipal,
nsTArray<DataStoreInfo>& aStores);
void DeleteDataStores(uint32_t aAppId);

5
dom/datastore/nsIDataStoreService.idl
View File

@ -6,8 +6,9 @@
#include "nsISupports.idl"
interface nsIDOMWindow;
interface nsIPrincipal;
[scriptable, uuid(0a050c4f-d292-4a14-8712-09bc1019840a)]
[scriptable, uuid(43a731b9-0b5d-400a-8711-8c912c3c3572)]
interface nsIDataStoreService : nsISupports
{
void installDataStore(in unsigned long appId,
@ -24,4 +25,6 @@ interface nsIDataStoreService : nsISupports
nsISupports getDataStores(in nsIDOMWindow window,
in DOMString name);
boolean checkPermission(in nsIPrincipal principal);
};

5
layout/build/nsLayoutStatics.cpp
View File

@ -132,6 +132,7 @@ using namespace mozilla::system;
#include "mozilla/IMEStateManager.h"
#include "nsDocument.h"
#include "mozilla/dom/HTMLVideoElement.h"
#include "CameraPreferences.h"
using namespace mozilla;
using namespace mozilla::net;
@ -296,6 +297,8 @@ nsLayoutStatics::Initialize()
CounterStyleManager::InitializeBuiltinCounterStyles();
CameraPreferences::Initialize();
return NS_OK;
}
@ -426,4 +429,6 @@ nsLayoutStatics::Shutdown()
nsDocument::XPCOMShutdown();
CacheObserver::Shutdown();
CameraPreferences::Shutdown();
}