mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
bc8ce42355
- Bug 1226200: Don't assume a TCPSocket has only one managee (and rename LoneManagedOrNull) r=jdm (aa2d0fcc14) - Bug 1227300, Part 1 - Add an alert notification component. r=MattN,wchen (37758ce9ff) - Bug 1230700. Make Notification::ShowInternal explicitly suppress the exception from GetPermissionInternal. r=smaug (9e288cf5ae) - Bug 1225336 - Add telemetry about web notification display/messages. r=wchen,kitcambridge p=vladan# Please enter the commit message for your changes. Lines starting (b2e481691a) - Bug 1219030 - Collect notification management telemetry. r=wchen,MattN; p=ally (c0ba425b4e) - Bug 1212611 - Use system notification for website notifications in Android. r=mfinkle (84985bcf01) - Bug 1227300, Part 2 - Implement showAlert. r=MattN,wchen (33eedc7e91) - Bug 1214305 - Part 0: Ensure site security service is initialized before trying to use DataStorage via IPC. (8bd73f43b0) - Bug 1137681 - Make user agent docshell overrides affect network requests. r=jduell (e8dabb8338) - Bug 1233245 - Propagate the interception information in the non-e10s case for all HTTP redirects, not just the internal ones; r=jdm (6922fddcf8) - Bug 1226444 - Use helper function to identify preloads. r=sicking (d110669f73) - Bug 1214305 - Part 1: Refactor the logic for querying whether a connection should go through a secure upgrade into NS_ShouldSecureUpgrade; r=mcmanus (2d04c78290) - Bug 1137681 - Per-tab user agent emulation. r=bz (4ff70db690) - Bug 1227300, Part 3 - Implement showAlert for the OS X alerts backend. r=mstange (5eb05d0728) - Bug 1227300, Part 4 - Implement showAlert for the libnotify alerts backend. r=karlt (0942fa2764) - Bug 1227300, Part 5 - Implement showAlert for the B2G alerts backend. r=mhenretty (e39581aea5) - Bug 1227300, Part 6 - Use showAlert to display web notifications. r=wchen (ab79eaa0c8) - domBug 1227300, Part 7 - Update test interfaces. a=testonly (387cb62772) - Bug 1214305 - Part 3: Add a nsIInterceptedChannel.secureUpgradedChannelURI helper; r=jdm (811d25bd58) - Bug 1214305 - Part 4: Use the secure upgraded channel URI in ServiceWorkerManager::PrepareFetchEvent; r=jdm (0c44bf527c) - Bug 1214305 - Part 5: Use the secure upgraded channel URI in FetchEventRunnable::Init; r=jdm (a30f239261) - Bug 1214305 - Part 6: Use a non-IPC redirect for synthesized upgraded responses to ensure the response URL is correctly propagated; r=mcmanus (8ba8a5728c) - Bug 1214305 - Part 7: Decide in the child process whether an intercepted channel should go through a secure upgrade; r=mcmanus (93e27decae) - Bug 1198397 - Add a test for interception of requests upgraded through the CSP upgrade-insecure-requests directive; r=jdm (21eb14eb34) - Bug 1214305 - Part 8: Enable secure upgrade service worker tests on e10s; r=jdm (c14f5fb504) - Bug 1214305 - Part 10: Clean up global DataStorage references in the child process; r=keeler (ef0b52d049) - Bug 1224771 - Close all web notifications when the originating tab is closed. r=wchen (da295b4ba7) - Bug 1214305 - Part 2: Refactor the logic for obtaining the secure upgraded URI into HttpBaseChannel; r=mcmanus (3346078285) - Bug 1237151 (part 1) - Remove ignored qualifiers in dom/media/gmp/. r=cpearce. (18134820a6) - Bug 1237151 (part 2) - Remove ignored qualifiers in WebRTC-relate code. r=jesup. (effe5bd694) - Bug 1118820 part 1 (style system part) - [css-grid] Implement the 'auto-fill' and 'auto-fit' keywords in the repeat() function. r=dholbert (5db1a577db) - Bug 1118820 part 2a - [css-grid] Add a LineNameMap class that lets us lookup line names with a dynamic number of 'repeat(auto-fill/auto-fit)' tracks taken into account. r=dholbert (3ecf4b53f0) - Bug 1118820 part 2b - [css-grid] Move the static functions FindLine/RFindLine/FindNamedLine into the LineNameMap class (idempotent patch). r=dholbert (efb12c594b) - Bug 1118820 part 2c+2d - [css-grid] Modify the LineNameMap::FindLine/RFindLine/FindNamedLine methods to take line names associated with 'repeat(auto-fill/auto-fit)' tracks into account. Instantiate and pass around a LineNameMap object instead of an array of line name arrays. r=dholbert (a3db750297) - Bug 1118820 part 3a - [css-grid] Modify TrackSizingFunctions to take a dynamic number of 'repeat(auto-fill/auto-fit)' tracks taking into account. r=dholbert (9aa6033332) - Bug 1118820 part 3b - [css-grid] Implement the CalculateRepeatFillCount method that calculates the number of 'repeat(auto-fill/auto-fit)' tracks to use for the given sizes. r=dholbert (cf75fab8a8) - Bug 1118820 part 4 - [css-grid] Provide the sizes to use for CalculateRepeatFillCount. r=dholbert (8184c00dba) - Bug 1118820 part 5 - [css-grid] Remove any empty 'repeat(auto-fit)' tracks at the end of its range and adjust affected grid area line numbers accordingly. r=dholbert (c02ba6a6e3) - Bug 1229165 - [css-grid] Reftests for min/max-width/height properties on the grid container. (725097f878) - Bug 1229999 - [css-grid] Reftest. (51b5bc9535) - Bug 1237151 (part 3) - Remove ignored qualifiers in all remaining code. r=froydnj. (69917ebbad) - more bits of Bug 1178892 - Split the profiler into Core & Gecko files (41bb127b9c) - Bug 1199841 - Restructure private browsing to remember status after OnStopRequest r=jdm (16c2c1044d) - Bug 1233845 - Report an interception error and cancel the HTTP channel when encountering a known topcrash situation. r=ehsan (5d08075110) - Bug 664163 - Fix Get(Local|Remote)(Address|Port) in HttpChannelChild. r=jduell (cbf70af4e8) - Bug 1229177 - Show the tracking protection shield for fetch and XHR requests. r=jduell (5833b3e872) - Bug 1220678 Don't crash when DivertToParent() is called on an intercepted channel. r=jdm (5d7ff6ecc8) - Bug 1220681 P1 Make HttpChannelChild::DivertToParent() work with synthetic responses. r=jdm (67715703ef) - Bug 1169819 Add browser chrome test to validate SW force refresh. r=ehsan (c0b6b3e874) - Bug 1220681 P2 Test synthetic responses that trigger downloads. r=ehsan (c701f3ddb1) - Bug 1220681 P3 Delay diversion on parent side until response head has been synthesized. r=jdm (7c697aacee) - Bug 1220681 P4 Automatically suspend the parent channel after synthesizing the response for diverison. r=jdm (27f31bcb35) - Bug 1220681 P5 Don't double suspend parent channel during synthesized divert to parent. r=jdm (62081d4b56) - Bug 1220681 P6 Use clients.claim() in browser_download.js to avoid worker unregister race. r=jdm (c8de291727) - Bug 1240161 - Remove "only-if-cached" from RequestCache; r=bkelly (283486f584) - Bug 1184550 - Add a mochitest for the Request constructor that tests that the body is set to used after being fetched and then fails on the second fetch with the same Request. r=bkelly (db4a967203) - Bug 1205495 - Correctly use the requests's body and redirect mode in reroute.js; r=nsm (a36a96624a) - Bug 1189656 - Fix fetch-request-fallback test paths. r=bkelly (366c884179) - Bug 1219085 - Import the fetch-request-redirect.https.html test from Blink; r=jdm (bf6b484d82) - Bug 1209081 - Part 1: Implement the "navigate" value for RequestMode; r=bkelly (a22f19d94b) - Bug 1209081 - Part 2: Upgrade the saved Requests in the DOM Cache to reflect the "navigate" RequestMode if they represent navigation content policy types; r=bkelly (60d1da23bb) - Bug 1219469 - Part 1: Revert the error reporting added in bug 1233845; r=jdm (dcc022b9d3) - Bug 1219469 - Part 2: Make HttpChannelParentListener be the controller; r=jdm,jduell (9c5f0dfbe0) - Bug 1229369 - Intercept redirected network fetches that have their request mode set to manual; r=jdm (fb21d86ed2)
344 lines
10 KiB
C++
344 lines
10 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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 "mozilla/dom/DesktopNotification.h"
|
|
#include "mozilla/dom/DesktopNotificationBinding.h"
|
|
#include "mozilla/dom/AppNotificationServiceOptionsBinding.h"
|
|
#include "mozilla/dom/ToJSValue.h"
|
|
#include "nsComponentManagerUtils.h"
|
|
#include "nsContentPermissionHelper.h"
|
|
#include "nsXULAppAPI.h"
|
|
#include "mozilla/dom/PBrowserChild.h"
|
|
#include "nsIDOMDesktopNotification.h"
|
|
#include "mozilla/Preferences.h"
|
|
#include "nsGlobalWindow.h"
|
|
#include "nsIAppsService.h"
|
|
#include "nsIScriptSecurityManager.h"
|
|
#include "nsServiceManagerUtils.h"
|
|
#include "PermissionMessageUtils.h"
|
|
#include "nsILoadContext.h"
|
|
|
|
namespace mozilla {
|
|
namespace dom {
|
|
|
|
/*
|
|
* Simple Request
|
|
*/
|
|
class DesktopNotificationRequest : public nsIContentPermissionRequest
|
|
, public nsRunnable
|
|
{
|
|
virtual ~DesktopNotificationRequest()
|
|
{
|
|
}
|
|
|
|
nsCOMPtr<nsIContentPermissionRequester> mRequester;
|
|
public:
|
|
NS_DECL_ISUPPORTS_INHERITED
|
|
NS_DECL_NSICONTENTPERMISSIONREQUEST
|
|
|
|
explicit DesktopNotificationRequest(DesktopNotification* aNotification)
|
|
: mDesktopNotification(aNotification)
|
|
{
|
|
mRequester = new nsContentPermissionRequester(mDesktopNotification->GetOwner());
|
|
}
|
|
|
|
NS_IMETHOD Run() override
|
|
{
|
|
nsCOMPtr<nsPIDOMWindow> window = mDesktopNotification->GetOwner();
|
|
nsContentPermissionUtils::AskPermission(this, window);
|
|
return NS_OK;
|
|
}
|
|
|
|
RefPtr<DesktopNotification> mDesktopNotification;
|
|
};
|
|
|
|
/* ------------------------------------------------------------------------ */
|
|
/* AlertServiceObserver */
|
|
/* ------------------------------------------------------------------------ */
|
|
|
|
NS_IMPL_ISUPPORTS(AlertServiceObserver, nsIObserver)
|
|
|
|
/* ------------------------------------------------------------------------ */
|
|
/* DesktopNotification */
|
|
/* ------------------------------------------------------------------------ */
|
|
|
|
uint32_t DesktopNotification::sCount = 0;
|
|
|
|
nsresult
|
|
DesktopNotification::PostDesktopNotification()
|
|
{
|
|
if (!mObserver) {
|
|
mObserver = new AlertServiceObserver(this);
|
|
}
|
|
|
|
#ifdef MOZ_B2G
|
|
nsCOMPtr<nsIAppNotificationService> appNotifier =
|
|
do_GetService("@mozilla.org/system-alerts-service;1");
|
|
if (appNotifier) {
|
|
nsCOMPtr<nsPIDOMWindow> window = GetOwner();
|
|
uint32_t appId = (window.get())->GetDoc()->NodePrincipal()->GetAppId();
|
|
|
|
if (appId != nsIScriptSecurityManager::UNKNOWN_APP_ID) {
|
|
nsCOMPtr<nsIAppsService> appsService = do_GetService("@mozilla.org/AppsService;1");
|
|
nsString manifestUrl = EmptyString();
|
|
appsService->GetManifestURLByLocalId(appId, manifestUrl);
|
|
mozilla::AutoSafeJSContext cx;
|
|
JS::Rooted<JS::Value> val(cx);
|
|
AppNotificationServiceOptions ops;
|
|
ops.mTextClickable = true;
|
|
ops.mManifestURL = manifestUrl;
|
|
|
|
if (!ToJSValue(cx, ops, &val)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
return appNotifier->ShowAppNotification(mIconURL, mTitle, mDescription,
|
|
mObserver, val);
|
|
}
|
|
}
|
|
#endif
|
|
|
|
nsCOMPtr<nsIAlertsService> alerts = do_GetService("@mozilla.org/alerts-service;1");
|
|
if (!alerts) {
|
|
return NS_ERROR_NOT_IMPLEMENTED;
|
|
}
|
|
|
|
// Generate a unique name (which will also be used as a cookie) because
|
|
// the nsIAlertsService will coalesce notifications with the same name.
|
|
// In the case of IPC, the parent process will use the cookie to map
|
|
// to nsIObservers, thus cookies must be unique to differentiate observers.
|
|
nsString uniqueName = NS_LITERAL_STRING("desktop-notification:");
|
|
uniqueName.AppendInt(sCount++);
|
|
nsCOMPtr<nsIDocument> doc = GetOwner()->GetDoc();
|
|
nsIPrincipal* principal = doc->NodePrincipal();
|
|
nsCOMPtr<nsILoadContext> loadContext = doc->GetLoadContext();
|
|
bool inPrivateBrowsing = loadContext && loadContext->UsePrivateBrowsing();
|
|
nsCOMPtr<nsIAlertNotification> alert =
|
|
do_CreateInstance(ALERT_NOTIFICATION_CONTRACTID);
|
|
NS_ENSURE_TRUE(alert, NS_ERROR_FAILURE);
|
|
nsresult rv = alert->Init(uniqueName, mIconURL, mTitle,
|
|
mDescription,
|
|
true,
|
|
uniqueName,
|
|
NS_LITERAL_STRING("auto"),
|
|
EmptyString(),
|
|
EmptyString(),
|
|
principal,
|
|
inPrivateBrowsing);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
return alerts->ShowAlert(alert, mObserver);
|
|
}
|
|
|
|
DesktopNotification::DesktopNotification(const nsAString & title,
|
|
const nsAString & description,
|
|
const nsAString & iconURL,
|
|
nsPIDOMWindow *aWindow,
|
|
nsIPrincipal* principal)
|
|
: DOMEventTargetHelper(aWindow)
|
|
, mTitle(title)
|
|
, mDescription(description)
|
|
, mIconURL(iconURL)
|
|
, mPrincipal(principal)
|
|
, mAllow(false)
|
|
, mShowHasBeenCalled(false)
|
|
{
|
|
if (Preferences::GetBool("notification.disabled", false)) {
|
|
return;
|
|
}
|
|
|
|
// If we are in testing mode (running mochitests, for example)
|
|
// and we are suppose to allow requests, then just post an allow event.
|
|
if (Preferences::GetBool("notification.prompt.testing", false) &&
|
|
Preferences::GetBool("notification.prompt.testing.allow", true)) {
|
|
mAllow = true;
|
|
}
|
|
}
|
|
|
|
void
|
|
DesktopNotification::Init()
|
|
{
|
|
RefPtr<DesktopNotificationRequest> request = new DesktopNotificationRequest(this);
|
|
|
|
NS_DispatchToMainThread(request);
|
|
}
|
|
|
|
DesktopNotification::~DesktopNotification()
|
|
{
|
|
if (mObserver) {
|
|
mObserver->Disconnect();
|
|
}
|
|
}
|
|
|
|
void
|
|
DesktopNotification::DispatchNotificationEvent(const nsString& aName)
|
|
{
|
|
if (NS_FAILED(CheckInnerWindowCorrectness())) {
|
|
return;
|
|
}
|
|
|
|
RefPtr<Event> event = NS_NewDOMEvent(this, nullptr, nullptr);
|
|
// it doesn't bubble, and it isn't cancelable
|
|
event->InitEvent(aName, false, false);
|
|
event->SetTrusted(true);
|
|
DispatchDOMEvent(nullptr, event, nullptr, nullptr);
|
|
}
|
|
|
|
nsresult
|
|
DesktopNotification::SetAllow(bool aAllow)
|
|
{
|
|
mAllow = aAllow;
|
|
|
|
// if we have called Show() already, lets go ahead and post a notification
|
|
if (mShowHasBeenCalled && aAllow) {
|
|
return PostDesktopNotification();
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
DesktopNotification::HandleAlertServiceNotification(const char *aTopic)
|
|
{
|
|
if (NS_FAILED(CheckInnerWindowCorrectness())) {
|
|
return;
|
|
}
|
|
|
|
if (!strcmp("alertclickcallback", aTopic)) {
|
|
DispatchNotificationEvent(NS_LITERAL_STRING("click"));
|
|
} else if (!strcmp("alertfinished", aTopic)) {
|
|
DispatchNotificationEvent(NS_LITERAL_STRING("close"));
|
|
}
|
|
}
|
|
|
|
void
|
|
DesktopNotification::Show(ErrorResult& aRv)
|
|
{
|
|
mShowHasBeenCalled = true;
|
|
|
|
if (!mAllow) {
|
|
return;
|
|
}
|
|
|
|
aRv = PostDesktopNotification();
|
|
}
|
|
|
|
JSObject*
|
|
DesktopNotification::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
|
{
|
|
return DesktopNotificationBinding::Wrap(aCx, this, aGivenProto);
|
|
}
|
|
|
|
/* ------------------------------------------------------------------------ */
|
|
/* DesktopNotificationCenter */
|
|
/* ------------------------------------------------------------------------ */
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(DesktopNotificationCenter)
|
|
NS_IMPL_CYCLE_COLLECTING_ADDREF(DesktopNotificationCenter)
|
|
NS_IMPL_CYCLE_COLLECTING_RELEASE(DesktopNotificationCenter)
|
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DesktopNotificationCenter)
|
|
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
|
|
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
|
NS_INTERFACE_MAP_END
|
|
|
|
already_AddRefed<DesktopNotification>
|
|
DesktopNotificationCenter::CreateNotification(const nsAString& aTitle,
|
|
const nsAString& aDescription,
|
|
const nsAString& aIconURL)
|
|
{
|
|
MOZ_ASSERT(mOwner);
|
|
|
|
RefPtr<DesktopNotification> notification =
|
|
new DesktopNotification(aTitle,
|
|
aDescription,
|
|
aIconURL,
|
|
mOwner,
|
|
mPrincipal);
|
|
notification->Init();
|
|
return notification.forget();
|
|
}
|
|
|
|
JSObject*
|
|
DesktopNotificationCenter::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
|
{
|
|
return DesktopNotificationCenterBinding::Wrap(aCx, this, aGivenProto);
|
|
}
|
|
|
|
/* ------------------------------------------------------------------------ */
|
|
/* DesktopNotificationRequest */
|
|
/* ------------------------------------------------------------------------ */
|
|
|
|
NS_IMPL_ISUPPORTS_INHERITED(DesktopNotificationRequest, nsRunnable,
|
|
nsIContentPermissionRequest)
|
|
|
|
NS_IMETHODIMP
|
|
DesktopNotificationRequest::GetPrincipal(nsIPrincipal * *aRequestingPrincipal)
|
|
{
|
|
if (!mDesktopNotification) {
|
|
return NS_ERROR_NOT_INITIALIZED;
|
|
}
|
|
|
|
NS_IF_ADDREF(*aRequestingPrincipal = mDesktopNotification->mPrincipal);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
DesktopNotificationRequest::GetWindow(nsIDOMWindow * *aRequestingWindow)
|
|
{
|
|
if (!mDesktopNotification) {
|
|
return NS_ERROR_NOT_INITIALIZED;
|
|
}
|
|
|
|
NS_IF_ADDREF(*aRequestingWindow = mDesktopNotification->GetOwner());
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
DesktopNotificationRequest::GetElement(nsIDOMElement * *aElement)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(aElement);
|
|
*aElement = nullptr;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
DesktopNotificationRequest::Cancel()
|
|
{
|
|
nsresult rv = mDesktopNotification->SetAllow(false);
|
|
mDesktopNotification = nullptr;
|
|
return rv;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
DesktopNotificationRequest::Allow(JS::HandleValue aChoices)
|
|
{
|
|
MOZ_ASSERT(aChoices.isUndefined());
|
|
nsresult rv = mDesktopNotification->SetAllow(true);
|
|
mDesktopNotification = nullptr;
|
|
return rv;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
DesktopNotificationRequest::GetRequester(nsIContentPermissionRequester** aRequester)
|
|
{
|
|
NS_ENSURE_ARG_POINTER(aRequester);
|
|
|
|
nsCOMPtr<nsIContentPermissionRequester> requester = mRequester;
|
|
requester.forget(aRequester);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
DesktopNotificationRequest::GetTypes(nsIArray** aTypes)
|
|
{
|
|
nsTArray<nsString> emptyOptions;
|
|
return nsContentPermissionUtils::CreatePermissionArray(NS_LITERAL_CSTRING("desktop-notification"),
|
|
NS_LITERAL_CSTRING("unused"),
|
|
emptyOptions,
|
|
aTypes);
|
|
}
|
|
|
|
} // namespace dom
|
|
} // namespace mozilla
|