wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 721004 - Revert changes to dom/telephony/nsTelephony.cpp [a=backout]

Browse Source
This commit is contained in:
Vivien Nicolas 2012-02-01 19:13:33 -08:00
parent b54446670d
commit 2a4d4c4dd8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dom/telephony/Telephony.cpp
View File

@ -57,7 +57,7 @@
USING_TELEPHONY_NAMESPACE
using mozilla::Preferences;
#define DOM_TELEPHONY_WHITELIST "dom.telephony.whitelist"
#define DOM_TELEPHONY_APP_PHONE_URL_PREF "dom.telephony.app.phone.url"
namespace {
@ -495,9 +495,13 @@ NS_NewTelephony(nsPIDOMWindow* aWindow, nsIDOMTelephony** aTelephony)
rv = documentURI->GetSpec(documentURL);
NS_ENSURE_SUCCESS(rv, rv);
// Fail if the node principal isn't trusted.
if (!nsContentUtils::URIIsChromeOrInPref(documentURI,
DOM_TELEPHONY_WHITELIST)) {
// The pref may not exist but in that case we deny access just as we do if
// the url doesn't match.
nsCString phoneAppURL;
if (NS_FAILED(Preferences::GetCString(DOM_TELEPHONY_APP_PHONE_URL_PREF,
&phoneAppURL)) ||
!phoneAppURL.Equals(documentURL,
nsCaseInsensitiveCStringComparator())) {
*aTelephony = nsnull;
return NS_OK;
}