mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
2e02aab9a7
- Bug 1198458: Webrtc updated to branch 43; pull made 2015-09-29 09:00AM PDT rs=jesup (c45a789c99) - Bug 1159489: WebRTC bitrate limits for video depend on input resolution and framerate r=pkerr (e3691a247c) - Bug 1132318: merge SelectSendFrameRate with SelectSendResolution r=bwc (bcc232994c) - Bug 1182289: Clean up dispatches in WebrtcGmpVideoEncoder/Decoder. r=jesup, a=abillings (b5e2030b07) - Bug 1167306: Fix preprocessor goof that disabled the load manager and some preference handling. r=jesup (0cc0dee688) - Bug 1198458: Rollup of changes previously applied to media/webrtc/trunk/webrtc and fixes to those rs=jesup r=froyd,jib,bwc,jesup,gcp,sotaro,pkerr,pehrsons (fe384d5e63) - Bug 1198458 Unbreak build on BSDs by fixing non-POSIX thread includes/usage. r=jesup (4ad8e88c17) - Bug 1198458: Fix typo in merges in OMX rs=bustage,kwierso on a CLOSED TREE (211b3b1a3f) - Bug 1226146: fix sndio audio_device backend after webrtc 43 landing in bug 1198458 r=jesup NPOTB (2b10ba3e86) - Bug 1231106 - Make BSDs fall-through to ASSERT as well. r=jesup (775d4fedae) - Bug 1231109 - Drop FreeBSD checks for unsupported versions. r=jld r=jesup (3cd55166fd) - Bug 1161079: Fix VideoCodecStats to allow for collecting encoder and decoder stats r=jib (1f98af8939) - add limits to fix gcc12 compile (d78098980f) - Bug 1193495 - Part 1: Test case. r=mt (add2ded009) - Bug 1193495 - Part 2: Maintain clones of supported codecs for each level, and do necessary checking to prevent payload-type clashes. r=mt (d45a24dba7) - Bug 1191301 - Re-enable the use of media.navigator.video.use_tmmbr pref. r=bwc (d2723821d4) - Bug 1094447 - Use UDP/TLS/RTP/SAVPF for audio/video m-lines. r=drno (e8e1dafd0a) - Bug 1173599 - a=imageattr support. r=mt (612fc343d7) - Bug 1173601 - Add a=simulcast support. r=mt (7c5303bacb) - Bug 1203246 - Factor track negotiation stuff out of JsepSessionImpl, and other simplification. r=mt (b71c809b78) - Bug 1212907 - a=rid support. r=mt (7479ab6984) - Bug 1212908 - Update a=simulcast to match new grammar in 03 draft. r=mt (e205d3b0dd) - Bug 1192390 - Part 1: Lay architectural groundwork for simulcast negotiation. r=mt r=jesup (e75dda3139) - Bug 1223160 - added SDP parser file reader. r=bwc (6752195791) - Bug 1192390 - Part 2: Simulcast and RID negotiation. r=mt (51b151ef52) - fix some warnings stuff (fed8f513a8) - Bug 1161317: Fix bug where sendonly video RTCP would be treated as outgoing RTP r=jesup (e24371fbe0) - Bug 1226347: Import cherry-pick of AEC changes from 43->48 (delay-agnostic AEC). r=pkerr (d3a074f4d8) - Bug 1226347 - Part 2: Allow control of AEC via prefs. r=rjesup (58f142005b) - Bug 1228788 - Force QT device release to happen on the main thread. r=jesup (885e9d1236) - Bug 1162218 - Make worker idle thread timeouts more strict, r=baku. (a7d2106987) - No bug. Remove a stray debugging printf of mine. r=me. (77b84cda62) - minor (22564a666e) - Bug 1224237 - Remove the !baseURL check from ServiceWorkerContainer::Register;r=bkelly (8b13c4dc49) - Bug 1196157 - Marks left by performance marks should print the domain of the application and not the complete URL. r=baku (d133708d8d) - Bug 1211970 - "Muted errors in workers are not correctly reported to the console". r=bz (42c15275f4) - Bug 1208559 - Tests. r=bholley (e16a30caa5) - Bug 1045891 - Tests for child-src r=ckerschb (90aa832cd0) - Bug 1223647: CSP erroneously inherited into dedicated workers. r=ckerschb (6fd8d9bfc9) - Bug 1218433 - Use AsyncOpen2 in dom/workers/ScriptLoader.cpp - part 1, r=sicking (a7e9187e52) - Bug 1218433 - Use AsyncOpen2 in dom/workers/ScriptLoader.cpp - part 3 - WPT, r=sicking, r=Ms2ger (e5e3c69f6a) - Bug 1218433 - Use AsyncOpen2 in dom/workers/ScriptLoader.cpp - part 2 - WPT, r=sicking, r=Ms2ger (1dd2d871ec) - Bug 1211967 - Fix how we report errors when loading a worker from a data url, r=bz (8517368daa) - nsRefPtr - RefPtr (34bb404530) - Bug 1231055 - Fix tags usage in PluginProvider. r=dtownsend (870b0e71eb) - bug 1228792 - remove use of array comprehensions r=mossop (3e31f18e83) - bug 1228792 - use standard version of catch r=mossop (f306557ca2) - Bug 1228009. Geolocation code needs to handle failures on its ErrorResults. r=smaug (8778a9e264) - Bug 1228707. Add a away to call Web IDL callbacks while ignoring any errors from them, and use it in a few places. r=smaug (a414e0d711) - Bug 1201692. Add a fast path to ExplicitChildIterator::Seek for the common case of seeking an actual DOM child of the parent node. r=wchen (01234ad43a) - Bug 1202186 - use nsISensitiveInfoHidden for console methods, r=baku (888b4506ad) - Bug 1223774 - Console API should check if the outer window exists, r=smaug (e0d7f408dc) - Bug 1200551 - Handle multiple %c formatters without a string between them by using only the last one for styling;r=baku,r=past (463550117a) - Bug 1213719 - Back out bug 1170314 for duplicate functionality. r=smaug (ae74e0ad52) - Bug 1154076 followup: Mark ConsoleRunnable::Run() as override. rs=ehsan (337181faab) - Bug 1127703 - "Support iteration on FormData" r=bz (4ddd461e99) - Bug 1230509 - BlobImplFile should return false in IsDateUnknown and IsSizeUnknown, r=bz (1079bfe2ab) - Bug 1198095 - FileReader should dispatch an error if the blob changes size in the meantime the read is executed, r=bz (263993a172) - Bug 1231094 - patch 1 - nsDOMFileReader to mozilla::dom::FileReader, r=sicking (aa8c3ff373) - Bug 1231094 - patch 2 - Get rid of FileIOObject, r=sicking (44af1e17dd) - Bug 1231100 - Get rid of nsIDOMFileReader - patch 1, r=sicking (c909d9d793) - Bug 1231100 - Get rid of nsIDOMFileReader - patch 2, r=sicking (4d3da1c566) - Bug 1161183: Don't show the add-on version in the list view. r=dao (002d8f6fb1) - Bug 1229519: Fix toolkit/modules to pass eslint checks. r=mak (8bbd9c8fe0)
181 lines
5.5 KiB
JavaScript
181 lines
5.5 KiB
JavaScript
/* 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/. */
|
|
|
|
"use strict";
|
|
|
|
const Ci = Components.interfaces;
|
|
const Cc = Components.classes;
|
|
const Cu = Components.utils;
|
|
const Cr = Components.results;
|
|
|
|
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
|
Cu.import("resource://gre/modules/Services.jsm");
|
|
|
|
XPCOMUtils.defineLazyModuleGetter(this, "MatchPattern",
|
|
"resource://gre/modules/MatchPattern.jsm");
|
|
XPCOMUtils.defineLazyModuleGetter(this, "WebRequestCommon",
|
|
"resource://gre/modules/WebRequestCommon.jsm");
|
|
|
|
let ContentPolicy = {
|
|
_classDescription: "WebRequest content policy",
|
|
_classID: Components.ID("938e5d24-9ccc-4b55-883e-c252a41f7ce9"),
|
|
_contractID: "@mozilla.org/webrequest/policy;1",
|
|
|
|
QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPolicy,
|
|
Ci.nsIFactory,
|
|
Ci.nsISupportsWeakReference]),
|
|
|
|
init() {
|
|
let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
|
|
registrar.registerFactory(this._classID, this._classDescription, this._contractID, this);
|
|
|
|
this.contentPolicies = new Map();
|
|
Services.cpmm.addMessageListener("WebRequest:AddContentPolicy", this);
|
|
Services.cpmm.addMessageListener("WebRequest:RemoveContentPolicy", this);
|
|
|
|
if (initialProcessData && initialProcessData.webRequestContentPolicies) {
|
|
for (let data of initialProcessData.webRequestContentPolicies.values()) {
|
|
this.addContentPolicy(data);
|
|
}
|
|
}
|
|
},
|
|
|
|
addContentPolicy({id, blocking, filter}) {
|
|
if (this.contentPolicies.size == 0) {
|
|
this.register();
|
|
}
|
|
if (filter.urls) {
|
|
filter.urls = new MatchPattern(filter.urls);
|
|
}
|
|
this.contentPolicies.set(id, {blocking, filter});
|
|
},
|
|
|
|
receiveMessage(msg) {
|
|
switch (msg.name) {
|
|
case "WebRequest:AddContentPolicy":
|
|
this.addContentPolicy(msg.data);
|
|
break;
|
|
|
|
case "WebRequest:RemoveContentPolicy":
|
|
this.contentPolicies.delete(msg.data.id);
|
|
if (this.contentPolicies.size == 0) {
|
|
this.unregister();
|
|
}
|
|
break;
|
|
}
|
|
},
|
|
|
|
register() {
|
|
let catMan = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager);
|
|
catMan.addCategoryEntry("content-policy", this._contractID, this._contractID, false, true);
|
|
},
|
|
|
|
unregister() {
|
|
let catMan = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager);
|
|
catMan.deleteCategoryEntry("content-policy", this._contractID, false);
|
|
},
|
|
|
|
shouldLoad(policyType, contentLocation, requestOrigin,
|
|
node, mimeTypeGuess, extra, requestPrincipal) {
|
|
let block = false;
|
|
let ids = [];
|
|
for (let [id, {blocking, filter}] of this.contentPolicies.entries()) {
|
|
if (WebRequestCommon.typeMatches(policyType, filter.types) &&
|
|
WebRequestCommon.urlMatches(contentLocation, filter.urls))
|
|
{
|
|
if (blocking) {
|
|
block = true;
|
|
}
|
|
ids.push(id);
|
|
}
|
|
}
|
|
|
|
if (!ids.length) {
|
|
return Ci.nsIContentPolicy.ACCEPT;
|
|
}
|
|
|
|
let windowId = 0;
|
|
let parentWindowId = -1;
|
|
let mm = Services.cpmm;
|
|
|
|
function getWindowId(window) {
|
|
return window.QueryInterface(Ci.nsIInterfaceRequestor)
|
|
.getInterface(Ci.nsIDOMWindowUtils)
|
|
.outerWindowID;
|
|
}
|
|
|
|
if (policyType == Ci.nsIContentPolicy.TYPE_SUBDOCUMENT ||
|
|
(node instanceof Ci.nsIDOMXULElement && node.localName == "browser"))
|
|
{
|
|
// Chrome sets frameId to the ID of the sub-window. But when
|
|
// Firefox loads an iframe, it sets |node| to the <iframe>
|
|
// element, whose window is the parent window. We adopt the
|
|
// Chrome behavior here.
|
|
node = node.contentWindow;
|
|
}
|
|
|
|
if (node) {
|
|
let window;
|
|
if (node instanceof Ci.nsIDOMWindow) {
|
|
window = node;
|
|
} else {
|
|
let doc;
|
|
if (node.ownerDocument) {
|
|
doc = node.ownerDocument;
|
|
} else {
|
|
doc = node;
|
|
}
|
|
window = doc.defaultView;
|
|
}
|
|
|
|
windowId = getWindowId(window);
|
|
if (window.parent !== window) {
|
|
parentWindowId = getWindowId(window.parent);
|
|
}
|
|
|
|
let ir = window.QueryInterface(Ci.nsIInterfaceRequestor)
|
|
.getInterface(Ci.nsIDocShell)
|
|
.QueryInterface(Ci.nsIInterfaceRequestor);
|
|
try {
|
|
// If e10s is disabled, this throws NS_NOINTERFACE for closed tabs.
|
|
mm = ir.getInterface(Ci.nsIContentFrameMessageManager);
|
|
} catch (e) {
|
|
if (e.result != Cr.NS_NOINTERFACE) {
|
|
throw e;
|
|
}
|
|
}
|
|
}
|
|
|
|
let data = {ids,
|
|
url: contentLocation.spec,
|
|
type: WebRequestCommon.typeForPolicyType(policyType),
|
|
windowId,
|
|
parentWindowId};
|
|
|
|
if (block) {
|
|
let rval = mm.sendSyncMessage("WebRequest:ShouldLoad", data);
|
|
if (rval.length == 1 && rval[0].cancel) {
|
|
return Ci.nsIContentPolicy.REJECT;
|
|
}
|
|
} else {
|
|
mm.sendAsyncMessage("WebRequest:ShouldLoad", data);
|
|
}
|
|
|
|
return Ci.nsIContentPolicy.ACCEPT;
|
|
},
|
|
|
|
shouldProcess: function(contentType, contentLocation, requestOrigin, insecNode, mimeType, extra) {
|
|
return Ci.nsIContentPolicy.ACCEPT;
|
|
},
|
|
|
|
createInstance: function(outer, iid) {
|
|
if (outer) {
|
|
throw Cr.NS_ERROR_NO_AGGREGATION;
|
|
}
|
|
return this.QueryInterface(iid);
|
|
},
|
|
};
|
|
|
|
ContentPolicy.init();
|