mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- Bug 1255818. Switch from JS_ClearPendingException to AutoJSAPI::ClearException for cases when we have an AutoJSAPI around. r=bholley (e1e0413493) - Bug 1253591. HTMLAllCollection should be rooted at the document, not the root element, so it can find the root element. r=peterv (c5f2f253a9) - Bug 1257270 - Use std::nullptr_t instead of nullptr_t in WMFUtils.h. r=cpearce (539e705876) - Bug 1251881 - use UniquePtr instead of ScopedDeletePtr in mozglue/linker/; r=glandium (2fe329e32c) - Bug 1219068 - Compute size correctly when a character consists entirely of glue. r=karlt (80f2e23268) - Bug 1246132 - Improve register allocation speed on large functions, r=sunfish. (6e023c252b) - Bug 1150354: Make nsPluginDirServiceProvider build with MSVC 2015 CTP 6, r=jmathies (0113760730) - Bug 1197311 - Remove PR_snprintf calls in dom/ r=froydnj (6268400ef0) - Bug 1255099 - XHR CTOR doesn't need to use implicitJSContext, r=bz (72f08fbc36) - Bug 1255597 - Part 1: Remove redundent trailing spaces. r=khuey (7f2240cb05) - Bug 1255597 - Part 2: Follow spec to modify the content-type check conditions which determine parsing XHR body or not. r=khuey (ba6f7fc536) - Bug 1255597 - Part 3: Synchronize content-type hint of HttpChannelChild to HttpChannelParent. r=jduell (bb97478b01) - Bug 1255597 - Part 4: Remove 'expected fail' settings and expect test cases in responsexml-media-type.htm should be passed. r=khuey (772884b4fb) - Bug 1201170 - During message diversion must be possible to suspend them. r=jduell (abb2361b7f) - Bug 1201174 - For FTP - in case of divertToParent, it myst be possible to delay delivering of OnDataAv./OnStopR. r=jduell (9299ef81be) - Bug 1247393 - use arrays of UniquePtr in ChannelEventQueue; r=mcmanus (7621205b53) - Bug 1254730 - ChannelEventQueue must be thread-safe, r=michal (b8e01204e9) - Bug 1254859 part 2. Switch the AutoEntryScript in nsXULTemplateBuilder::InitHTMLTemplateRoot to take ownership of error reporting. r=bholley (f183ec692c) - Bug 1254859 part 1. Switch the AutoEntryScript in nsGlobalWindow::FireOnNewGlobalObject to take ownership of error reporting. r=bholley (b0cd891917) - Bug 1254860. Switch the AutoEntryScript TestShellCommandParent::RunCallback to taking ownership of error reporting. r=bholley (0c9697e60f) - Bug 1254857. Switch the AutoEntryScript in xpc::EvalInSandbox to take ownership of error reporting. r=bholley (93b6bfc87c) - Bug 1254847 part 3. Make AutoEntryScript always take ownership of error reporting. r=bholley (3c2929462f) - Bug 1256688 - Continue using getPropertyDescriptor for has in Sandbox창. r=peterv (be7e50b715) - Bug 1254730 - patch 2 - Better comments and a better management of lifetime of ChannelEvents, r=michal (8348911e35) - Bug 1163198 - Remove instances of #ifdef PR_LOGGING in dom/plugins. r=froydnj (ba13039dfa) - Bug 1253216 - clean up the atomic ops ifdef nest. r=jorendorff (6ca747d3cf) - Bug 1257055 - Use jit/arm64/Architecture-arm64.h on non-JIT aarch64. r=lth (4f3949cd19) - Bug 1253379 - Cache timings not send to HttpChannelChild r=mayhemer (395172278f) - align SetAllowStaleCacheContent to FF52, possible misspatch (9d29d27011)
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
|
||||
#include "mozilla/Logging.h"
|
||||
#include "plstr.h"
|
||||
#include "prprf.h"
|
||||
#include "mozilla/Snprintf.h"
|
||||
|
||||
#include "mozilla/Telemetry.h"
|
||||
#include "nsIInterfaceRequestor.h"
|
||||
@@ -1767,12 +1767,12 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsDocument)
|
||||
if (tmp->mDocumentURI)
|
||||
tmp->mDocumentURI->GetSpec(uri);
|
||||
if (nsid < ArrayLength(kNSURIs)) {
|
||||
PR_snprintf(name, sizeof(name), "nsDocument %s %s %s",
|
||||
loadedAsData.get(), kNSURIs[nsid], uri.get());
|
||||
snprintf_literal(name, "nsDocument %s %s %s",
|
||||
loadedAsData.get(), kNSURIs[nsid], uri.get());
|
||||
}
|
||||
else {
|
||||
PR_snprintf(name, sizeof(name), "nsDocument %s %s",
|
||||
loadedAsData.get(), uri.get());
|
||||
snprintf_literal(name, "nsDocument %s %s",
|
||||
loadedAsData.get(), uri.get());
|
||||
}
|
||||
cb.DescribeRefCountedNode(tmp->mRefCnt.get(), name);
|
||||
}
|
||||
@@ -2962,10 +2962,9 @@ GetFormattedTimeString(PRTime aTime, nsAString& aFormattedTimeString)
|
||||
PR_ExplodeTime(aTime, PR_LocalTimeParameters, &prtime);
|
||||
// "MM/DD/YYYY hh:mm:ss"
|
||||
char formatedTime[24];
|
||||
if (PR_snprintf(formatedTime, sizeof(formatedTime),
|
||||
"%02ld/%02ld/%04hd %02ld:%02ld:%02ld",
|
||||
prtime.tm_month + 1, prtime.tm_mday, prtime.tm_year,
|
||||
prtime.tm_hour , prtime.tm_min, prtime.tm_sec)) {
|
||||
if (snprintf_literal(formatedTime, "%02d/%02d/%04d %02d:%02d:%02d",
|
||||
prtime.tm_month + 1, prtime.tm_mday, int(prtime.tm_year),
|
||||
prtime.tm_hour , prtime.tm_min, prtime.tm_sec)) {
|
||||
CopyASCIItoUTF16(nsDependentCString(formatedTime), aFormattedTimeString);
|
||||
} else {
|
||||
// If we for whatever reason failed to find the last modified time
|
||||
|
||||
Reference in New Issue
Block a user