mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
4e6138a54f
- remove PM alertTime custom (911dd825ec) - Bug 1208346 - Alert service Do Not Disturb backend. r=jaws (0047051b4e) - Bug 1208346 - Fix manualDoNotDisturb build bustage on Android. r=bustage (39275a49bd) - Add some shadow warnings back (64eb2adf55) - some window fixes by Roy (72e6a9b98e) - remove parameter of DoesD3D11DeviceWork (243dfb24f4) - Bug 1197296. Check the error code of Map. r=bas (9debd274fd) - Bug 1221348 - Part 1: Unify crash signatures. r=jrmuizel (80763d326d) - Bug 1221348 - Part 2: Fix texture sharing detection code on Intel. r=jrmuizel (fb0390850d) - Bug 1097321 - Add layers.amd-switchable-gfx.enabled pref. r=jrmuizel (3963a35cbc) - Bug 720589 - mMatchCounts may be accessed with a nonexisting index. r=neil (fdbdd7e228) - Bug 1224975 - add telemetry for font loading. r=m_kato (013a6e8fc7) - Bug 1188376: Split Hello Telemetry values from general WebRTC r=jib (3887cc3201) - Bug 1198883 - Part 1: Improve ICE candidates telemetry probes. r=bwc (2d02a3d752) - Bug 1198883 - Part 2: Added WebRTC ICE candidates to Telemetry. r+vladan (fa8032043f) - Bug 1201926 - Add support for keyed histograms to Fennec's Telemetry module, r=nalexander (8b96ebf026) - Bug 1213780 - Fix Telemetry reporting repeated hang annotations for Chrome hangs. r=aklotz (afde812b08) - Bug 1128768: Part 4 - Update telemetry to serialize BHR hang annotations; r=gfritzsche (7c1b8f5fa5) - Bug 1215540 - Fix Telemetry reporting repeated hang annotations for Thread hangs. r=aklotz (afed35f06f) - Bug 896740 - Limit the number of chrome-hangs reported to Telemetry. r=vladan (a37ba72225) - missing bits of Bug 932865 - Expose thread hang stats (c19c41ae06) - Bug 1187138 (part 1) - Replace nsBaseHashtable::Enumerate() calls in toolkit/ with iterators. r=froydnj. (ba92a8464f) - Bug 1121040 - Don't send RETURN keypresses to content while a satchel autocomplete entry is selected. r=Gijs,smaug (762efd7cc8) - Bug 1145146 - Remove offensive comment from nsFormFillController r=mak (7a6b0eb4e1) - Bug 1136085 - Part 1 - Don't store & collect subsession histograms on mobile. r=vladan (911084001c) - missing bits of Bug 1023461 - Add HangStack class to support internal string buffer; r=vladan (599bee2150) - Bug 1196381 - Eliminate breakpad dependency in ThreadStackHelper; r=nfroyd r=snorp (ff8a632975) - fix misspatch of 1157282 and 1198883 (9a216ab188) - Bug 1034138 - a. Get native stack for permahangs in BHM; r=snorp (772970d0e0) - Bug 1211411 - Limit the number of thread hang stats reported to Telemetry. r=vladan (fd72bc8b62) - Bug 1219751 - Change the the depth limit of the thread hangs stack to use the 99th percentile. r=gfritzsche (fc59bd7598) - Bug 1133521 - Enable BHR on Beta. r=vladan (2501c6a0ff) - Bug 1219216 - Fix a wrong comment in BackgroundHangMonitor.h. r=gfritzsche (e974320361) - bits of Bug 1134279 - Change Telemetry data producers to use the correct (d00e84b7f3) - bits of Bug 977026 - Part 2: B2G loader (bf1208a73a) - bug 1198450 - Firefox fails to load about:home if Firefox was installed to a folder with non-Latin name r=jimm (c4df06a69e) - Bug 1222167 - fix initialization order in GeckoChildProcessHost; r=jld (6bad274479) - Bug 1141693 - Build and use a PIE plugin-container on Android 5.0+. Based on a patch by Mike Hommey. r=me,glandium (78dc877aec) - Bug 1187533 - Change how Gtk+2 plugin-container is started on Gtk+3 builds. r=billm (93c2b8a1b0) - Bug 1063359 - Unconditionally use -Wl,--no-as-needed when building with GNU ld/gold. r=mshal (643e92ca49) - Bug 971811 - Don't prepend an empty existing DYLD_INSERT_LIBRARIES path when launching the plugin. r=smichaud (c72df0073c) - Bug 1189352: Fix NSPR_LOG_FILE with absolute paths for sandboxed child on Windows. r=bbondy (f4bb51c123) - Bug 1189967 - Be slightly more explicit about some conversions to std::wstring. r=nfroyd (7bec611359) - Bug 1201438: Add non-sandboxed Windows content processes as target peers for handle duplication. r=bbondy (1ca7f499e9) - Bug 1201438 - Fixup for builds with disabled sandbox. (de125d156e) - Bug 1165895: Add NPAPI sandbox rule for the crash server pipe and x64 Temp dir write access. r=bbondy (e9f601912d) - Bug 1202988 - Don't use GetTempPath for flash's mms.cfg hack for low integrity. r=aklotz (b4a0d7f856) - Bug 1225023: Allow Flash Player to create Adobe\Flash Player and Macromedia\Flash Player directories. r=bbondy (c5120afc1d) - Bug 1218681 - add plugin-container standalone process code. The Code associate with ARCH. r=hev (03dfb21776) - bug 1130976 - Flash context menu causes CPOW deadlock with AdBlock Plus, plugins should spin even loop in content process instead of the chrome process r=billm (52f4d33633) - Bug 1157237: Move invocation of async NPP_New to an async task; r=jimm (7b6c1a577e) - Bug 1175147 - Don't do threadsafety asserts for NPN_MemAlloc and friends, r=jimm (b4ce5b33ce) - fix strange misspatch (8a96a61819) - Bug 1219244 - use UniquePtr instead of nsAutoArrayPtr in dom/plugins/; r=aklotz (19fabc55b5) - Bug 1155503: BrowserStreamParent should null out its NPStream pointer and we should check for it; r=jimm (eddb82b8b4) - some crashrep stuff (bb2b046090) - Bug 1192077 - Convert AndroidBridge JNIEnv calls; r=esawin (821453089e) - Bug 554171 - Add plugin thread checks to functions that must only be called on the main thread. r=jimm (f2eb3822da) - Bug 1149358: Ensure that plugin streams are not manipulated by PluginAsyncSurrogate if plugin destruction is imminent; r=jimm (6dd99c94ee) - Bug 1198302 - Ensure that PluginAsyncSurrogate::NotifyAsyncInitFailed properly aborts any PluginAsyncSurrogate::WaitForInit calls. r=jimm (23c1fbfcfe) - Bug 1201239 - Add a proper null check in PluginAsyncSurrogate::NotifyAsyncInitFailed; r=jimm (5d8ff9f8aa) - Bug 1208059: Make nsNPAPIPluginInstance support WeakPtr and modify PluginAsyncSurrogate to use it; r=jimm (174a3166b1) - Bug 1171453: Make ParentNPObjects aware of AsyncNPObject wrappers; r=jimm (92e608831d) - Bug 1217726 - Fix -Wimplicit-fallthrough warnings in dom/plugins. r=jimm (32db26ede8) - Bug 1167720 - Fix invalid window ID provided to GTK3 plugin container children. r=karlt (d8c2de0c19) - Remove Windows-specific synchronous plugin drawing code. (bug 1218688 part 1, r=jimm) (5e4b60ea33) - Remove Linux-specific synchronous plugin drawing code. (bug 1218688 part 2, r=jimm) (edb29f27b8) - Remove Mac-specific synchronous plugin drawing code. (bug 1218688 part 3, r=benwa) (acc6b57b23) - Assert that we do not attempt synchronous painting of windowless Desktop plugins. (bug 1218688 part 4, r=bsmedberg) (c34094b038) - Bug 1195472 - Call Show after Enable on puppet widgets to avoid an assertion when running crash tests. r=aklotz (405ed2c1d1) - Add explicit keyword to AsyncScrollBase constructor to fix static analysis build (bug 1139220 part 6, r=shu) (4cc37b9a3b) - Bug 1146561 - Add back the visibility check for Mac plugins. r=jmuizelaar (91a4a5a8e9) - namespace (9b4919f8fa) - Bug 1217307 - Remove some unnecessary null checks in rest of dom/. r=njn (de5d69880a) - Bug 1225137 - Avoid crash on some platforms if scrollbar fading is enabled and the duration is set to zero. r=spohl (a16954de2f) - Bug 1114554 - Disable NotificationStorage debug logging. r=dholbert (c2722fa4ed) - Bug 1073551 - fix doorhangers to not steal focus unless explicitly opened using mouse or keyboard, r=jaws (be6109cf6d) - Bug 1169629: Add-on install confirmation notification appears anchored to older dismissed anchors. r=dao (684535c7cc) - Bug 1194706: make sure that the notification icons and doorhangers are shown in undocked chat windows too. r=Mossop (68e0ced913) - Bug 1207089 - Telemetry for permission notifications. r=MattN,vladan (ff421236ea) - Bug 1215526 - part 4 - make preprocess-tab-svgs.py report extra dependencies; r=glandium (98b64b5c45)
274 lines
9.1 KiB
C++
274 lines
9.1 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
// vim:cindent:ts=2:et:sw=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/. */
|
|
|
|
/* code for loading in @font-face defined font data */
|
|
|
|
#include "mozilla/Logging.h"
|
|
|
|
#include "nsFontFaceLoader.h"
|
|
|
|
#include "nsError.h"
|
|
#include "nsContentUtils.h"
|
|
#include "mozilla/Preferences.h"
|
|
#include "mozilla/Telemetry.h"
|
|
#include "FontFaceSet.h"
|
|
#include "nsPresContext.h"
|
|
#include "nsIPrincipal.h"
|
|
#include "nsIScriptSecurityManager.h"
|
|
#include "nsIHttpChannel.h"
|
|
#include "nsIContentPolicy.h"
|
|
#include "nsContentPolicyUtils.h"
|
|
|
|
#include "mozilla/gfx/2D.h"
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::dom;
|
|
|
|
#define LOG(args) MOZ_LOG(gfxUserFontSet::GetUserFontsLog(), mozilla::LogLevel::Debug, args)
|
|
#define LOG_ENABLED() MOZ_LOG_TEST(gfxUserFontSet::GetUserFontsLog(), \
|
|
LogLevel::Debug)
|
|
|
|
nsFontFaceLoader::nsFontFaceLoader(gfxUserFontEntry* aUserFontEntry,
|
|
nsIURI* aFontURI,
|
|
FontFaceSet* aFontFaceSet,
|
|
nsIChannel* aChannel)
|
|
: mUserFontEntry(aUserFontEntry),
|
|
mFontURI(aFontURI),
|
|
mFontFaceSet(aFontFaceSet),
|
|
mChannel(aChannel)
|
|
{
|
|
mStartTime = TimeStamp::Now();
|
|
}
|
|
|
|
nsFontFaceLoader::~nsFontFaceLoader()
|
|
{
|
|
if (mUserFontEntry) {
|
|
mUserFontEntry->mLoader = nullptr;
|
|
}
|
|
if (mLoadTimer) {
|
|
mLoadTimer->Cancel();
|
|
mLoadTimer = nullptr;
|
|
}
|
|
if (mFontFaceSet) {
|
|
mFontFaceSet->RemoveLoader(this);
|
|
}
|
|
}
|
|
|
|
void
|
|
nsFontFaceLoader::StartedLoading(nsIStreamLoader* aStreamLoader)
|
|
{
|
|
int32_t loadTimeout =
|
|
Preferences::GetInt("gfx.downloadable_fonts.fallback_delay", 3000);
|
|
if (loadTimeout > 0) {
|
|
mLoadTimer = do_CreateInstance("@mozilla.org/timer;1");
|
|
if (mLoadTimer) {
|
|
mLoadTimer->InitWithFuncCallback(LoadTimerCallback,
|
|
static_cast<void*>(this),
|
|
loadTimeout,
|
|
nsITimer::TYPE_ONE_SHOT);
|
|
}
|
|
} else {
|
|
mUserFontEntry->mFontDataLoadingState = gfxUserFontEntry::LOADING_SLOWLY;
|
|
}
|
|
mStreamLoader = aStreamLoader;
|
|
}
|
|
|
|
/* static */ void
|
|
nsFontFaceLoader::LoadTimerCallback(nsITimer* aTimer, void* aClosure)
|
|
{
|
|
nsFontFaceLoader* loader = static_cast<nsFontFaceLoader*>(aClosure);
|
|
|
|
if (!loader->mFontFaceSet) {
|
|
// We've been canceled
|
|
return;
|
|
}
|
|
|
|
gfxUserFontEntry* ufe = loader->mUserFontEntry.get();
|
|
bool updateUserFontSet = true;
|
|
|
|
// If the entry is loading, check whether it's >75% done; if so,
|
|
// we allow another timeout period before showing a fallback font.
|
|
if (ufe->mFontDataLoadingState == gfxUserFontEntry::LOADING_STARTED) {
|
|
int64_t contentLength;
|
|
uint32_t numBytesRead;
|
|
if (NS_SUCCEEDED(loader->mChannel->GetContentLength(&contentLength)) &&
|
|
contentLength > 0 &&
|
|
contentLength < UINT32_MAX &&
|
|
NS_SUCCEEDED(loader->mStreamLoader->GetNumBytesRead(&numBytesRead)) &&
|
|
numBytesRead > 3 * (uint32_t(contentLength) >> 2))
|
|
{
|
|
// More than 3/4 the data has been downloaded, so allow 50% extra
|
|
// time and hope the remainder will arrive before the additional
|
|
// time expires.
|
|
ufe->mFontDataLoadingState = gfxUserFontEntry::LOADING_ALMOST_DONE;
|
|
uint32_t delay;
|
|
loader->mLoadTimer->GetDelay(&delay);
|
|
loader->mLoadTimer->InitWithFuncCallback(LoadTimerCallback,
|
|
static_cast<void*>(loader),
|
|
delay >> 1,
|
|
nsITimer::TYPE_ONE_SHOT);
|
|
updateUserFontSet = false;
|
|
LOG(("userfonts (%p) 75%% done, resetting timer\n", loader));
|
|
}
|
|
}
|
|
|
|
// If the font is not 75% loaded, or if we've already timed out once
|
|
// before, we mark this entry as "loading slowly", so the fallback
|
|
// font will be used in the meantime, and tell the context to refresh.
|
|
if (updateUserFontSet) {
|
|
ufe->mFontDataLoadingState = gfxUserFontEntry::LOADING_SLOWLY;
|
|
nsTArray<gfxUserFontSet*> fontSets;
|
|
ufe->GetUserFontSets(fontSets);
|
|
for (gfxUserFontSet* fontSet : fontSets) {
|
|
nsPresContext* ctx = FontFaceSet::GetPresContextFor(fontSet);
|
|
if (ctx) {
|
|
fontSet->IncrementGeneration();
|
|
ctx->UserFontSetUpdated(ufe);
|
|
LOG(("userfonts (%p) timeout reflow for pres context %p\n",
|
|
loader, ctx));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS(nsFontFaceLoader, nsIStreamLoaderObserver)
|
|
|
|
NS_IMETHODIMP
|
|
nsFontFaceLoader::OnStreamComplete(nsIStreamLoader* aLoader,
|
|
nsISupports* aContext,
|
|
nsresult aStatus,
|
|
uint32_t aStringLen,
|
|
const uint8_t* aString)
|
|
{
|
|
if (!mFontFaceSet) {
|
|
// We've been canceled
|
|
return aStatus;
|
|
}
|
|
|
|
mFontFaceSet->RemoveLoader(this);
|
|
|
|
TimeStamp doneTime = TimeStamp::Now();
|
|
TimeDuration downloadTime = doneTime - mStartTime;
|
|
uint32_t downloadTimeMS = uint32_t(downloadTime.ToMilliseconds());
|
|
Telemetry::Accumulate(Telemetry::WEBFONT_DOWNLOAD_TIME, downloadTimeMS);
|
|
|
|
if (LOG_ENABLED()) {
|
|
nsAutoCString fontURI;
|
|
mFontURI->GetSpec(fontURI);
|
|
if (NS_SUCCEEDED(aStatus)) {
|
|
LOG(("userfonts (%p) download completed - font uri: (%s) time: %d ms\n",
|
|
this, fontURI.get(), downloadTimeMS));
|
|
} else {
|
|
LOG(("userfonts (%p) download failed - font uri: (%s) error: %8.8x\n",
|
|
this, fontURI.get(), aStatus));
|
|
}
|
|
}
|
|
|
|
if (NS_SUCCEEDED(aStatus)) {
|
|
// for HTTP requests, check whether the request _actually_ succeeded;
|
|
// the "request status" in aStatus does not necessarily indicate this,
|
|
// because HTTP responses such as 404 (Not Found) will still result in
|
|
// a success code and potentially an HTML error page from the server
|
|
// as the resulting data. We don't want to use that as a font.
|
|
nsCOMPtr<nsIRequest> request;
|
|
nsCOMPtr<nsIHttpChannel> httpChannel;
|
|
aLoader->GetRequest(getter_AddRefs(request));
|
|
httpChannel = do_QueryInterface(request);
|
|
if (httpChannel) {
|
|
bool succeeded;
|
|
nsresult rv = httpChannel->GetRequestSucceeded(&succeeded);
|
|
if (NS_SUCCEEDED(rv) && !succeeded) {
|
|
aStatus = NS_ERROR_NOT_AVAILABLE;
|
|
}
|
|
}
|
|
}
|
|
|
|
// The userFontEntry is responsible for freeing the downloaded data
|
|
// (aString) when finished with it; the pointer is no longer valid
|
|
// after FontDataDownloadComplete returns.
|
|
// This is called even in the case of a failed download (HTTP 404, etc),
|
|
// as there may still be data to be freed (e.g. an error page),
|
|
// and we need to load the next source.
|
|
bool fontUpdate =
|
|
mUserFontEntry->FontDataDownloadComplete(aString, aStringLen, aStatus);
|
|
|
|
mFontFaceSet->GetUserFontSet()->RecordFontLoadDone(aStringLen, doneTime);
|
|
|
|
// when new font loaded, need to reflow
|
|
if (fontUpdate) {
|
|
nsTArray<gfxUserFontSet*> fontSets;
|
|
mUserFontEntry->GetUserFontSets(fontSets);
|
|
for (gfxUserFontSet* fontSet : fontSets) {
|
|
nsPresContext* ctx = FontFaceSet::GetPresContextFor(fontSet);
|
|
if (ctx) {
|
|
// Update layout for the presence of the new font. Since this is
|
|
// asynchronous, reflows will coalesce.
|
|
ctx->UserFontSetUpdated(mUserFontEntry);
|
|
LOG(("userfonts (%p) reflow for pres context %p\n", this, ctx));
|
|
}
|
|
}
|
|
}
|
|
|
|
// done with font set
|
|
mFontFaceSet = nullptr;
|
|
if (mLoadTimer) {
|
|
mLoadTimer->Cancel();
|
|
mLoadTimer = nullptr;
|
|
}
|
|
|
|
return NS_SUCCESS_ADOPTED_DATA;
|
|
}
|
|
|
|
void
|
|
nsFontFaceLoader::Cancel()
|
|
{
|
|
mUserFontEntry->mFontDataLoadingState = gfxUserFontEntry::NOT_LOADING;
|
|
mUserFontEntry->mLoader = nullptr;
|
|
mFontFaceSet = nullptr;
|
|
if (mLoadTimer) {
|
|
mLoadTimer->Cancel();
|
|
mLoadTimer = nullptr;
|
|
}
|
|
mChannel->Cancel(NS_BINDING_ABORTED);
|
|
}
|
|
|
|
/* static */ nsresult
|
|
nsFontFaceLoader::CheckLoadAllowed(nsIPrincipal* aSourcePrincipal,
|
|
nsIURI* aTargetURI,
|
|
nsISupports* aContext)
|
|
{
|
|
nsresult rv;
|
|
|
|
if (!aSourcePrincipal)
|
|
return NS_OK;
|
|
|
|
// check with the security manager
|
|
nsIScriptSecurityManager* secMan = nsContentUtils::GetSecurityManager();
|
|
rv = secMan->CheckLoadURIWithPrincipal(aSourcePrincipal, aTargetURI,
|
|
nsIScriptSecurityManager::STANDARD);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
// check content policy
|
|
int16_t shouldLoad = nsIContentPolicy::ACCEPT;
|
|
rv = NS_CheckContentLoadPolicy(nsIContentPolicy::TYPE_FONT,
|
|
aTargetURI,
|
|
aSourcePrincipal,
|
|
aContext,
|
|
EmptyCString(), // mime type
|
|
nullptr,
|
|
&shouldLoad,
|
|
nsContentUtils::GetContentPolicy(),
|
|
nsContentUtils::GetSecurityManager());
|
|
|
|
if (NS_FAILED(rv) || NS_CP_REJECTED(shouldLoad)) {
|
|
return NS_ERROR_CONTENT_BLOCKED;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|