mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
56aad8a83e
- Bug 1149987 - Part 2: Make ErrorResult unassignable; r=bzbarsky (32661559b) - Bug 1149987 - Part 3: Give ErrorResult a move constructor and a move assignment operator; (27f4c6125) - Bug 1149987 - Part 4: Do not attempt to delete ErrorResult::mMessage when deserializing the object from IPDL; r=bzbarsky (0f9dcc603) - Bug 1110485 P0 Add an ErrorResult constructor that takes nsresult. (72a779666) - Bug 1110485 P1 Refactor Cache IPC requests to use a separate actor. (a7e4c1959) - Bug 1127914 - Part 1 - Duplicate keyed histograms for double submission. (78673277f) - Bug 1127914 - Part 2 - Duplicate normal histograms for double submission. (55c302057) - Bug 1127914 - Part 3 - Submit duplicate histogram data for 'non-classic' telemetry sessions. r=vladan (bb3e49c43) - Bug 1120362 - Part 1 - Enable snapshotting and clearing subsession histograms. (14378a6e5) - Bug 1120362 - Part 2 - Enable snapshotting and clearing keyed subsession histograms. r=vladan (c0e0bfb3e) - partial apply of Bug 1119281 - Fix missing telemetry client id (ae0dc0194) - Bug 1122047 - Part 1 - Sketch out Telemetry environment module. (0419391b0) - Bug 1122047 - Part 2 - Make TelemetryPing shutdown properly on delayed initialization (0102cef09) - Bug 1122061 - Give TelemetryPing a common API for sending pings. (999cb825d) - Bug 1122061 - Move TelemetrySession tests out of test_telemetryPing.js. (2d5b61de1) - Bug 1120362 - Part 3 - Reset subsession histograms on telemetry payload collections. r=vladan (0d3f04df1) - Bug 1120362 - Part 4 - Start new telemetry subsessions on local midnight. r=vladan (93eb9ca21) - Bug 1120363 - Break up Telemetry sessions on environment changes. (a7c8d70c7) - Bug 1122052 - Remove duplicated data from TelemetrySession. (bb905d602) - Bug 1122050 - Remove persona and experiment data from TelemetrySession. (40ca59a9e) - Bug 1134268 - Part 1 - Fix and order Telemetry shutdown for TelemetryPing and TelemetrySession. r=yoric (30d0f0656) - Bug 1134268 - Part 2 - Fixup TelemetryEnvironment shutdown if the module wasnt initialized. r=vladan (ec2875fea) - Bug 1135076 - Missing histograms in childPayloads. r=vladan (9f317cf9d) - Bug 1134279 - Make TelemetryPing and TelemetrySession code use the "FHR enabled" & "Telemetry enabled" prefs properly. r=vladan (4050d7f24) - Bug 1128768: Part 1 - Modify IPC to allow retrieval of topmost routing id on the stack; (cd2e8a2f0) - Bug 1129249 - Add a "restyle" feature to profiler and split the style label in Cleopatra based on the restyleSource, r=dholbert,mstange (b37df94d1) - Bug 1150684: Remove XPCOM.h from IOInterposer.h (5b7e1cef3) - Bug 1093934 - Create a XPCOM library that can be used to support standalone WebRTC. (9ec8a819f) - Merge branch 'master' of https://github.com/rmottola/Arctic-Fox (d0f05eea4) - Bug 1128768: Part 2,3,4 - Refactor hang annotation code; (f5086aba9) (with xpcom/threads/ fixes for my tele-removed tree) - Bug 1128768: Part 5 - Update plugin code to retrieve SWF file for hang annotations; (774a47aec) - Bug 1110485 P2 Remove 'P' prefix from non-protocol IPC types in Cache API. r=baku (ea29a10cf) - Bug 1110485 P3 Move Fetch IPC PHeaderEntry type to Cache. Rename HeadesEntry. (9eba0aca0) - Bug 1110485 P4 Keep Cache Actors alive during async operations. (eb75f2316) - Bug 1110485 P5 Replace useless DBSchema class type with namespace. (159b902db) - Bug 1110485 P6 Remove useless cache::FileUtils type (1bdf00fc3) - Bug 1110485 P7 Rename DeleteCache() to DeleteCacheId() better distinguish it from CacheDelete(). (5199f9d6f) - Bug 1110485 P8 Correctly set the Feature on the stream control child actor. (c8673cb13) - Bug 1150691 Fix Cache API race with storage invalidation. (2723dff50) - Bug 1151892 Refactor Cache Manager Context usage to be more sane and fix shutdown assert. r=ehsan (ea96381cf) - Bug 1136331 - OdinMonkey: allow stdlib calls in heap expressions (2fc5e2bfd) - Bug 1141439 - Exit with an error code instead of falling through the REMOTE_NOT_FOUND code path when the X-remote returns an explicit command line handler error. (afcf9b1aa) - Bug 1135825: Add missing MOZ_OVERRIDE annotation in RTCIdentityProviderRegistrar.h (e8beec4e8) - (Bug 1135138 is not merged due to broken build)
155 lines
4.7 KiB
C++
155 lines
4.7 KiB
C++
/* -*- 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 "nsPluginPlayPreviewInfo.h"
|
|
#include "nsWildCard.h"
|
|
|
|
using namespace mozilla;
|
|
|
|
nsPluginPlayPreviewInfo::nsPluginPlayPreviewInfo(const char* aMimeType,
|
|
bool aIgnoreCTP,
|
|
const char* aRedirectURL,
|
|
const char* aWhitelist)
|
|
: mMimeType(aMimeType), mIgnoreCTP(aIgnoreCTP), mRedirectURL(aRedirectURL),
|
|
mWhitelist(aWhitelist) {}
|
|
|
|
nsPluginPlayPreviewInfo::nsPluginPlayPreviewInfo(
|
|
const nsPluginPlayPreviewInfo* aSource)
|
|
{
|
|
MOZ_ASSERT(aSource);
|
|
|
|
mMimeType = aSource->mMimeType;
|
|
mIgnoreCTP = aSource->mIgnoreCTP;
|
|
mRedirectURL = aSource->mRedirectURL;
|
|
mWhitelist = aSource->mWhitelist;
|
|
}
|
|
|
|
nsPluginPlayPreviewInfo::~nsPluginPlayPreviewInfo()
|
|
{
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS(nsPluginPlayPreviewInfo, nsIPluginPlayPreviewInfo)
|
|
|
|
NS_IMETHODIMP
|
|
nsPluginPlayPreviewInfo::GetMimeType(nsACString& aMimeType)
|
|
{
|
|
aMimeType = mMimeType;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsPluginPlayPreviewInfo::GetIgnoreCTP(bool* aIgnoreCTP)
|
|
{
|
|
*aIgnoreCTP = mIgnoreCTP;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsPluginPlayPreviewInfo::GetRedirectURL(nsACString& aRedirectURL)
|
|
{
|
|
aRedirectURL = mRedirectURL;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsPluginPlayPreviewInfo::GetWhitelist(nsACString& aWhitelist)
|
|
{
|
|
aWhitelist = mWhitelist;
|
|
return NS_OK;
|
|
}
|
|
|
|
/* static */ nsresult
|
|
nsPluginPlayPreviewInfo::CheckWhitelist(const nsACString& aPageURI,
|
|
const nsACString& aObjectURI,
|
|
const nsACString& aWhitelist,
|
|
bool *_retval)
|
|
{
|
|
if (aWhitelist.Length() == 0) {
|
|
// Considering empty whitelist as '*' entry.
|
|
*_retval = true;
|
|
return NS_OK;
|
|
}
|
|
|
|
// Parses whitelist as comma separated entries of
|
|
// [@page_url object_url|@page_url|object_url]
|
|
// where page_url and object_url pattern matches for aPageURI
|
|
// and aObjectURI, and performs matching as the same time.
|
|
nsACString::const_iterator start, end;
|
|
aWhitelist.BeginReading(start);
|
|
aWhitelist.EndReading(end);
|
|
|
|
nsAutoCString pageURI(aPageURI);
|
|
nsAutoCString objectURI(aObjectURI);
|
|
nsACString::const_iterator pos = start, entryStart, entryEnd;
|
|
nsACString::const_iterator pagePatternStart, pagePatternEnd;
|
|
nsACString::const_iterator objectPatternStart, objectPatternEnd;
|
|
int matchResult;
|
|
bool matched, didMatching;
|
|
while (pos != end) {
|
|
matched = true;
|
|
didMatching = false;
|
|
entryStart = pos;
|
|
// Looking for end of the entry.
|
|
while (pos != end && *pos != ',') {
|
|
pos++;
|
|
}
|
|
entryEnd = pos;
|
|
if (entryStart != entryEnd && *entryStart == '@') {
|
|
// Pattern for aPageURL is found, finding a space or end of the entry.
|
|
pagePatternStart = entryStart;
|
|
pagePatternStart++;
|
|
pagePatternEnd = pagePatternStart;
|
|
while (pagePatternEnd != entryEnd && *pagePatternEnd != ' ') {
|
|
pagePatternEnd++;
|
|
}
|
|
nsAutoCString pagePattern(Substring(pagePatternStart, pagePatternEnd));
|
|
matchResult = NS_WildCardMatch(pageURI.get(), pagePattern.get(), true);
|
|
matched &= matchResult == MATCH;
|
|
didMatching = true;
|
|
objectPatternStart = pagePatternEnd;
|
|
} else {
|
|
objectPatternStart = entryStart;
|
|
}
|
|
while (objectPatternStart != entryEnd && *objectPatternStart == ' ') {
|
|
objectPatternStart++;
|
|
}
|
|
if (objectPatternStart != entryEnd) {
|
|
// Pattern for aObjectURL is found, removing trailing spaces.
|
|
objectPatternEnd = entryEnd;
|
|
--objectPatternEnd;
|
|
while (objectPatternStart != objectPatternEnd &&
|
|
*objectPatternEnd == ' ') {
|
|
objectPatternEnd--;
|
|
};
|
|
objectPatternEnd++;
|
|
nsAutoCString objectPattern(Substring(objectPatternStart,
|
|
objectPatternEnd));
|
|
matchResult = NS_WildCardMatch(objectURI.get(), objectPattern.get(), true);
|
|
matched &= matchResult == MATCH;
|
|
didMatching = true;
|
|
}
|
|
// Ignoring match result for empty entries.
|
|
if (didMatching && matched) {
|
|
*_retval = true;
|
|
return NS_OK;
|
|
}
|
|
if (pos == end) {
|
|
break;
|
|
}
|
|
pos++;
|
|
}
|
|
|
|
*_retval = false;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsPluginPlayPreviewInfo::CheckWhitelist(const nsACString& aPageURI,
|
|
const nsACString& aObjectURI,
|
|
bool *_retval)
|
|
{
|
|
return CheckWhitelist(aPageURI, aObjectURI, mWhitelist, _retval);
|
|
}
|