Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge inbound to central, a=merge

Browse Source
This commit is contained in:
Wes Kocher 2016-10-04 17:32:01 -07:00
commit 5a2fb874ca
102 changed files with 858 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
b2g/app/b2g.js
View File

@ -959,11 +959,6 @@ pref("layout.accessiblecaret.bar.enabled", true);
// Hide the caret in cursor mode after 3 seconds.
pref("layout.accessiblecaret.timeout_ms", 3000);
// APZ on real devices supports long tap events.
#ifdef MOZ_WIDGET_GONK
pref("layout.accessiblecaret.use_long_tap_injector", false);
#endif
// Hide carets and text selection dialog during scrolling.
pref("layout.accessiblecaret.always_show_when_scrolling", false);

3
b2g/app/nsBrowserApp.cpp
View File

@ -41,6 +41,7 @@
# include <binder/ProcessState.h>
#endif
#include "mozilla/Sprintf.h"
#include "mozilla/Telemetry.h"
#include "mozilla/WindowsDllBlocklist.h"
@ -123,7 +124,7 @@ static int do_main(int argc, char* argv[])
}
char appEnv[MAXPATHLEN];
snprintf(appEnv, MAXPATHLEN, "XUL_APP_FILE=%s", argv[2]);
SprintfLiteral(appEnv, "XUL_APP_FILE=%s", argv[2]);
if (putenv(strdup(appEnv))) {
Output("Couldn't set %s.\n", appEnv);
return 255;

3
browser/app/nsBrowserApp.cpp
View File

@ -39,6 +39,7 @@
#include "nsXPCOMPrivate.h" // for MAXPATHLEN and XPCOM_DLL
#include "mozilla/Sprintf.h"
#include "mozilla/Telemetry.h"
#include "mozilla/WindowsDllBlocklist.h"
@ -192,7 +193,7 @@ static int do_main(int argc, char* argv[], char* envp[], nsIFile *xreDirectory)
}
char appEnv[MAXPATHLEN];
snprintf(appEnv, MAXPATHLEN, "XUL_APP_FILE=%s", argv[2]);
SprintfLiteral(appEnv, "XUL_APP_FILE=%s", argv[2]);
if (putenv(strdup(appEnv))) {
Output("Couldn't set %s.\n", appEnv);
return 255;

2
browser/locales/en-US/chrome/browser/preferences/preferences.properties
View File

@ -183,7 +183,7 @@ disableContainersAlertTitle=Close All Container Tabs?
# LOCALIZATION NOTE (disableContainersMsg): Semi-colon list of plural forms.
# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
# #S is the number of container tabs
disableContainersMsg=If you disable Container Tabs now, #S container tab will be closed. Are you sure you want to disable Container Tabs?;If you disable Containers Tabs now, #S container tabs will be closed. Are you sure you want to disable Containers Tabs?
disableContainersMsg=If you disable Container Tabs now, #S container tab will be closed. Are you sure you want to disable Container Tabs?;If you disable Container Tabs now, #S container tabs will be closed. Are you sure you want to disable Container Tabs?
# LOCALIZATION NOTE (disableContainersOkButton): Semi-colon list of plural forms.
# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals

29
build/autoconf/clang-plugin.m4
View File

@ -121,6 +121,35 @@ if test -n "$ENABLE_CLANG_PLUGIN"; then
LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DHAVE_NEW_ASTMATCHER_NAMES"
fi
dnl Check if we can compile has(ignoringParenImpCasts()) because
dnl before 3.9 that ignoringParenImpCasts was done internally by "has".
dnl See https://www.mail-archive.com/cfe-commits@lists.llvm.org/msg25234.html
AC_CACHE_CHECK(for has with ignoringParenImpCasts,
ac_cv_has_accepts_ignoringParenImpCasts,
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
_SAVE_CXXFLAGS="$CXXFLAGS"
_SAVE_CXX="$CXX"
_SAVE_MACOSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET"
unset MACOSX_DEPLOYMENT_TARGET
CXXFLAGS="${LLVM_CXXFLAGS}"
CXX="${HOST_CXX}"
AC_TRY_COMPILE([#include "clang/ASTMatchers/ASTMatchers.h"],
[using namespace clang::ast_matchers;
expr(has(ignoringParenImpCasts(declRefExpr())));
],
ac_cv_has_accepts_ignoringParenImpCasts="yes",
ac_cv_has_accepts_ignoringParenImpCasts="no")
CXX="$_SAVE_CXX"
CXXFLAGS="$_SAVE_CXXFLAGS"
export MACOSX_DEPLOYMENT_TARGET="$_SAVE_MACOSX_DEPLOYMENT_TARGET"
AC_LANG_RESTORE
])
if test "$ac_cv_has_accepts_ignoringParenImpCasts" = "yes"; then
LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DHAS_ACCEPTS_IGNORINGPARENIMPCASTS"
fi
AC_DEFINE(MOZ_CLANG_PLUGIN)
fi

130
build/clang-plugin/clang-plugin.cpp
View File

@ -42,6 +42,14 @@ typedef ASTConsumer *ASTConsumerPtr;
#define cxxRecordDecl recordDecl
#endif
#ifndef HAS_ACCEPTS_IGNORINGPARENIMPCASTS
#define hasIgnoringParenImpCasts(x) has(x)
#else
// Before clang 3.9 "has" would behave like has(ignoringParenImpCasts(x)),
// however doing that explicitly would not compile.
#define hasIgnoringParenImpCasts(x) has(ignoringParenImpCasts(x))
#endif
// Check if the given expression contains an assignment expression.
// This can either take the form of a Binary Operator or a
// Overloaded Operator Call.
@ -163,6 +171,11 @@ private:
virtual void run(const MatchFinder::MatchResult &Result);
};
class SprintfLiteralChecker : public MatchFinder::MatchCallback {
public:
virtual void run(const MatchFinder::MatchResult &Result);
};
ScopeChecker Scope;
ArithmeticArgChecker ArithmeticArg;
TrivialCtorDtorChecker TrivialCtorDtor;
@ -180,6 +193,7 @@ private:
RefCountedCopyConstructorChecker RefCountedCopyConstructor;
AssertAssignmentChecker AssertAttribution;
KungFuDeathGripChecker KungFuDeathGrip;
SprintfLiteralChecker SprintfLiteral;
MatchFinder AstMatcher;
};
@ -284,6 +298,35 @@ bool isIgnoredPathForImplicitConversion(const Decl *Declaration) {
return false;
}
bool isIgnoredPathForSprintfLiteral(const CallExpr *Call, const SourceManager &SM) {
SourceLocation Loc = Call->getLocStart();
SmallString<1024> FileName = SM.getFilename(Loc);
llvm::sys::fs::make_absolute(FileName);
llvm::sys::path::reverse_iterator Begin = llvm::sys::path::rbegin(FileName),
End = llvm::sys::path::rend(FileName);
for (; Begin != End; ++Begin) {
if (Begin->compare_lower(StringRef("angle")) == 0 ||
Begin->compare_lower(StringRef("chromium")) == 0 ||
Begin->compare_lower(StringRef("crashreporter")) == 0 ||
Begin->compare_lower(StringRef("google-breakpad")) == 0 ||
Begin->compare_lower(StringRef("harfbuzz")) == 0 ||
Begin->compare_lower(StringRef("libstagefright")) == 0 ||
Begin->compare_lower(StringRef("mtransport")) == 0 ||
Begin->compare_lower(StringRef("protobuf")) == 0 ||
Begin->compare_lower(StringRef("skia")) == 0 ||
// Gtest uses snprintf as GTEST_SNPRINTF_ with sizeof
Begin->compare_lower(StringRef("testing")) == 0) {
return true;
}
if (Begin->compare_lower(StringRef("webrtc")) == 0) {
// Ignore trunk/webrtc, but not media/webrtc
++Begin;
return Begin != End && Begin->compare_lower(StringRef("trunk")) == 0;
}
}
return false;
}
bool isInterestingDeclForImplicitConversion(const Decl *Declaration) {
return !isInIgnoredNamespaceForImplicitConversion(Declaration) &&
!isIgnoredPathForImplicitConversion(Declaration);
@ -861,6 +904,23 @@ AST_MATCHER(CallExpr, isAssertAssignmentTestFunc) {
&& Method->getName() == AssertName;
}
AST_MATCHER(CallExpr, isSnprintfLikeFunc) {
static const std::string Snprintf = "snprintf";
static const std::string Vsnprintf = "vsnprintf";
const FunctionDecl *Func = Node.getDirectCallee();
if (!Func || isa<CXXMethodDecl>(Func)) {
return false;
}
StringRef Name = getNameChecked(Func);
if (Name != Snprintf && Name != Vsnprintf) {
return false;
}
return !isIgnoredPathForSprintfLiteral(&Node, Finder->getASTContext().getSourceManager());
}
AST_MATCHER(CXXRecordDecl, isLambdaDecl) {
return Node.isLambda();
}
@ -1091,9 +1151,9 @@ DiagnosticsMatcher::DiagnosticsMatcher() {
AstMatcher.addMatcher(
binaryOperator(
allOf(binaryEqualityOperator(),
hasLHS(has(
hasLHS(hasIgnoringParenImpCasts(
declRefExpr(hasType(qualType((isFloat())))).bind("lhs"))),
hasRHS(has(
hasRHS(hasIgnoringParenImpCasts(
declRefExpr(hasType(qualType((isFloat())))).bind("rhs"))),
unless(anyOf(isInSystemHeader(), isInSkScalarDotH()))))
.bind("node"),
@ -1195,6 +1255,17 @@ DiagnosticsMatcher::DiagnosticsMatcher() {
AstMatcher.addMatcher(varDecl(hasType(isRefPtr())).bind("decl"),
&KungFuDeathGrip);
AstMatcher.addMatcher(
callExpr(isSnprintfLikeFunc(),
allOf(hasArgument(0, ignoringParenImpCasts(declRefExpr().bind("buffer"))),
anyOf(hasArgument(1, sizeOfExpr(hasIgnoringParenImpCasts(declRefExpr().bind("size")))),
hasArgument(1, integerLiteral().bind("immediate")),
hasArgument(1, declRefExpr(to(varDecl(hasType(isConstQualified()),
hasInitializer(integerLiteral().bind("constant")))))))))
.bind("funcCall"),
&SprintfLiteral
);
}
// These enum variants determine whether an allocation has occured in the code.
@ -1834,6 +1905,61 @@ void DiagnosticsMatcher::KungFuDeathGripChecker::run(
Diag.Report(E->getLocStart(), NoteID) << NoteThing << getNameChecked(D);
}
void DiagnosticsMatcher::SprintfLiteralChecker::run(
const MatchFinder::MatchResult &Result) {
if (!Result.Context->getLangOpts().CPlusPlus) {
// SprintfLiteral is not usable in C, so there is no point in issuing these
// warnings.
return;
}
DiagnosticsEngine &Diag = Result.Context->getDiagnostics();
unsigned ErrorID = Diag.getDiagnosticIDs()->getCustomDiagID(
DiagnosticIDs::Error, "Use %1 instead of %0 when writing into a character array.");
unsigned NoteID = Diag.getDiagnosticIDs()->getCustomDiagID(
DiagnosticIDs::Note, "This will prevent passing in the wrong size to %0 accidentally.");
const CallExpr *D = Result.Nodes.getNodeAs<CallExpr>("funcCall");
StringRef Name = D->getDirectCallee()->getName();
const char *Replacement;
if (Name == "snprintf") {
Replacement = "SprintfLiteral";
} else {
assert(Name == "vsnprintf");
Replacement = "VsprintfLiteral";
}
const DeclRefExpr *Buffer = Result.Nodes.getNodeAs<DeclRefExpr>("buffer");
const DeclRefExpr *Size = Result.Nodes.getNodeAs<DeclRefExpr>("size");
if (Size) {
// Match calls like snprintf(x, sizeof(x), ...).
if (Buffer->getFoundDecl() != Size->getFoundDecl()) {
return;
}
Diag.Report(D->getLocStart(), ErrorID) << Name << Replacement;
Diag.Report(D->getLocStart(), NoteID) << Name;
return;
}
const QualType QType = Buffer->getType();
const ConstantArrayType *Type = dyn_cast<ConstantArrayType>(QType.getTypePtrOrNull());
if (Type) {
// Match calls like snprintf(x, 100, ...), where x is int[100];
const IntegerLiteral *Literal = Result.Nodes.getNodeAs<IntegerLiteral>("immediate");
if (!Literal) {
// Match calls like: const int y = 100; snprintf(x, y, ...);
Literal = Result.Nodes.getNodeAs<IntegerLiteral>("constant");
}
if (Type->getSize().ule(Literal->getValue())) {
Diag.Report(D->getLocStart(), ErrorID) << Name << Replacement;
Diag.Report(D->getLocStart(), NoteID) << Name;
}
}
}
class MozCheckAction : public PluginASTAction {
public:
ASTConsumerPtr CreateASTConsumer(CompilerInstance &CI,

47
build/clang-plugin/tests/TestSprintfLiteral.cpp Normal file
View File

@ -0,0 +1,47 @@
#include <cstdio>
void bad() {
char x[100];
snprintf(x, sizeof(x), "bar"); // expected-error {{Use SprintfLiteral instead of snprintf when writing into a character array.}} expected-note {{This will prevent passing in the wrong size to snprintf accidentally.}}
snprintf(x, 100, "bar"); // expected-error {{Use SprintfLiteral instead of snprintf when writing into a character array.}} expected-note {{This will prevent passing in the wrong size to snprintf accidentally.}}
snprintf(x, 101, "bar"); // expected-error {{Use SprintfLiteral instead of snprintf when writing into a character array.}} expected-note {{This will prevent passing in the wrong size to snprintf accidentally.}}
const int hundred = 100;
snprintf(x, hundred, "bar"); // expected-error {{Use SprintfLiteral instead of snprintf when writing into a character array.}} expected-note {{This will prevent passing in the wrong size to snprintf accidentally.}}
const int hundredandone = 101;
snprintf(x, hundredandone, "bar"); // expected-error {{Use SprintfLiteral instead of snprintf when writing into a character array.}} expected-note {{This will prevent passing in the wrong size to snprintf accidentally.}}
}
void ok() {
char x[100];
int y;
snprintf(x, sizeof(y), "what");
snprintf(x, 50, "what");
int nothundred = 100;
nothundred = 99;
snprintf(x, nothundred, "what");
}
void vargs_bad(va_list args) {
char x[100];
vsnprintf(x, sizeof(x), "bar", args); // expected-error {{Use VsprintfLiteral instead of vsnprintf when writing into a character array.}} expected-note {{This will prevent passing in the wrong size to vsnprintf accidentally.}}
vsnprintf(x, 100, "bar", args); // expected-error {{Use VsprintfLiteral instead of vsnprintf when writing into a character array.}} expected-note {{This will prevent passing in the wrong size to vsnprintf accidentally.}}
vsnprintf(x, 101, "bar", args); // expected-error {{Use VsprintfLiteral instead of vsnprintf when writing into a character array.}} expected-note {{This will prevent passing in the wrong size to vsnprintf accidentally.}}
const int hundred = 100;
vsnprintf(x, hundred, "bar", args); // expected-error {{Use VsprintfLiteral instead of vsnprintf when writing into a character array.}} expected-note {{This will prevent passing in the wrong size to vsnprintf accidentally.}}
const int hundredandone = 101;
vsnprintf(x, hundredandone, "bar", args); // expected-error {{Use VsprintfLiteral instead of vsnprintf when writing into a character array.}} expected-note {{This will prevent passing in the wrong size to vsnprintf accidentally.}}
}
void vargs_good(va_list args) {
char x[100];
int y;
vsnprintf(x, sizeof(y), "what", args);
vsnprintf(x, 50, "what", args);
int nothundred = 100;
nothundred = 99;
vsnprintf(x, nothundred, "what", args);
}

1
build/clang-plugin/tests/moz.build
View File

@ -33,6 +33,7 @@ SOURCES += [
'TestNonTemporaryClass.cpp',
'TestNoRefcountedInsideLambdas.cpp',
'TestRefCountedCopyConstructor.cpp',
'TestSprintfLiteral.cpp',
'TestStackClass.cpp',
'TestTrivialCtorDtor.cpp',
]

14
build/moz.configure/toolchain.configure
View File

@ -345,16 +345,20 @@ def check_compiler(compiler, language, target):
# Note: MSVC, while supporting C++11, still reports 199711L for __cplusplus.
# Note: this is a strict version check because we used to always add
# -std=gnu++11.
if info.language == 'C++' and info.language_version != 201103:
if info.type in ('clang-cl', 'clang', 'gcc'):
if info.language == 'C++':
if info.type in ('clang', 'gcc') and info.language_version != 201103:
append_flag('-std=gnu++11')
# MSVC 2015 headers include C++14 features, but don't guard them
# with appropriate checks.
if info.type == 'clang-cl' and info.language_version != 201402:
append_flag('-std=c++14')
# We force clang-cl to emulate Visual C++ 2013 Update 3 with fallback to
# We force clang-cl to emulate Visual C++ 2015 Update 2 with fallback to
# cl.exe.
if info.type == 'clang-cl' and info.version != '18.00.30723':
if info.type == 'clang-cl' and info.version != '19.00.23918':
# Those flags are direct clang-cl flags that don't need -Xclang, add
# them directly.
flags.append('-fms-compatibility-version=18.00.30723')
flags.append('-fms-compatibility-version=19.00.23918')
flags.append('-fallback')
# Check compiler target

5
dom/base/nsHostObjectProtocolHandler.cpp
View File

@ -134,11 +134,6 @@ BroadcastBlobURLRegistration(const nsACString& aURI,
return;
}
// We don't need to broadcast Blob URL if we have just 1 content process.
if (Preferences::GetInt("dom.ipc.processCount", 0) <= 1) {
return;
}
ContentChild* cc = ContentChild::GetSingleton();
BlobChild* actor = cc->GetOrCreateActorForBlobImpl(aBlobImpl);
if (NS_WARN_IF(!actor)) {

17
dom/ipc/Blob.cpp
View File

@ -912,7 +912,8 @@ CreateBlobImpl(const ParentBlobConstructorParams& aParams,
template <class ChildManagerType>
void
BlobDataFromBlobImpl(ChildManagerType* aManager, BlobImpl* aBlobImpl,
BlobData& aBlobData)
BlobData& aBlobData,
nsTArray<UniquePtr<AutoIPCStream>>& aIPCStreams)
{
MOZ_ASSERT(gProcessType != GeckoProcessType_Default);
MOZ_ASSERT(aBlobImpl);
@ -931,7 +932,7 @@ BlobDataFromBlobImpl(ChildManagerType* aManager, BlobImpl* aBlobImpl,
index < count;
index++) {
BlobDataFromBlobImpl(aManager, subBlobs->ElementAt(index),
subBlobDatas[index]);
subBlobDatas[index], aIPCStreams);
}
return;
@ -951,9 +952,11 @@ BlobDataFromBlobImpl(ChildManagerType* aManager, BlobImpl* aBlobImpl,
aBlobImpl->GetInternalStream(getter_AddRefs(inputStream), rv);
MOZ_ALWAYS_TRUE(!rv.Failed());
AutoIPCStream autoStream;
autoStream.Serialize(inputStream, aManager);
aBlobData = autoStream.TakeValue();
UniquePtr<AutoIPCStream> autoStream(new AutoIPCStream());
autoStream->Serialize(inputStream, aManager);
aBlobData = autoStream->TakeValue();
aIPCStreams.AppendElement(Move(autoStream));
}
RemoteInputStream::RemoteInputStream(BlobImpl* aBlobImpl,
@ -3347,6 +3350,7 @@ BlobChild::GetOrCreateFromImpl(ChildManagerType* aManager,
MOZ_ASSERT(!aBlobImpl->IsDateUnknown());
AnyBlobConstructorParams blobParams;
nsTArray<UniquePtr<AutoIPCStream>> autoIPCStreams;
if (gProcessType == GeckoProcessType_Default) {
RefPtr<BlobImpl> sameProcessImpl = aBlobImpl;
@ -3358,7 +3362,7 @@ BlobChild::GetOrCreateFromImpl(ChildManagerType* aManager,
// BlobData is going to be populate here and it _must_ be send via IPC in
// order to avoid leaks.
BlobData blobData;
BlobDataFromBlobImpl(aManager, aBlobImpl, blobData);
BlobDataFromBlobImpl(aManager, aBlobImpl, blobData, autoIPCStreams);
nsString contentType;
aBlobImpl->GetType(contentType);
@ -3393,6 +3397,7 @@ BlobChild::GetOrCreateFromImpl(ChildManagerType* aManager,
return nullptr;
}
autoIPCStreams.Clear();
return actor;
}

21
dom/ipc/ContentChild.cpp
View File

@ -3450,5 +3450,26 @@ ContentChild::RecvGetFilesResponse(const nsID& aUUID,
return true;
}
/* static */ void
ContentChild::FatalErrorIfNotUsingGPUProcess(const char* const aProtocolName,
const char* const aErrorMsg,
base::ProcessId aOtherPid)
{
// If we're communicating with the same process or the UI process then we
// want to crash normally. Otherwise we want to just warn as the other end
// must be the GPU process and it crashing shouldn't be fatal for us.
if (aOtherPid == base::GetCurrentProcId() ||
(GetSingleton() && GetSingleton()->OtherPid() == aOtherPid)) {
mozilla::ipc::FatalError(aProtocolName, aErrorMsg, false);
} else {
nsAutoCString formattedMessage("IPDL error [");
formattedMessage.AppendASCII(aProtocolName);
formattedMessage.AppendLiteral("]: \"");
formattedMessage.AppendASCII(aErrorMsg);
formattedMessage.AppendLiteral("\".");
NS_WARNING(formattedMessage.get());
}
}
} // namespace dom
} // namespace mozilla

10
dom/ipc/ContentChild.h
View File

@ -671,6 +671,16 @@ public:
virtual bool
RecvBlobURLUnregistration(const nsCString& aURI) override;
/**
* Helper function for protocols that use the GPU process when available.
* Overrides FatalError to just be a warning when communicating with the
* GPU process since we don't want to crash the content process when the
* GPU process crashes.
*/
static void FatalErrorIfNotUsingGPUProcess(const char* const aProtocolName,
const char* const aErrorMsg,
base::ProcessId aOtherPid);
private:
static void ForceKillTimerCallback(nsITimer* aTimer, void* aClosure);
void StartForceKillTimer();

4
dom/media/VideoUtils.cpp
View File

@ -29,6 +29,10 @@
namespace mozilla {
NS_NAMED_LITERAL_CSTRING(kEMEKeySystemClearkey, "org.w3.clearkey");
NS_NAMED_LITERAL_CSTRING(kEMEKeySystemWidevine, "com.widevine.alpha");
NS_NAMED_LITERAL_CSTRING(kEMEKeySystemPrimetime, "com.adobe.primetime");
using layers::PlanarYCbCrImage;
CheckedInt64 SaferMultDiv(int64_t aValue, uint32_t aMul, uint32_t aDiv) {

6
dom/media/VideoUtils.h
View File

@ -40,9 +40,9 @@ using mozilla::CheckedUint32;
namespace mozilla {
// EME Key System String.
static NS_NAMED_LITERAL_CSTRING(kEMEKeySystemClearkey, "org.w3.clearkey");
static NS_NAMED_LITERAL_CSTRING(kEMEKeySystemWidevine, "com.widevine.alpha");
static NS_NAMED_LITERAL_CSTRING(kEMEKeySystemPrimetime, "com.adobe.primetime");
extern const nsLiteralCString kEMEKeySystemClearkey;
extern const nsLiteralCString kEMEKeySystemWidevine;
extern const nsLiteralCString kEMEKeySystemPrimetime;
/**
* ReentrantMonitorConditionallyEnter

6
dom/media/ipc/VideoDecoderManagerChild.cpp
View File

@ -145,5 +145,11 @@ VideoDecoderManagerChild::DeallocateSurfaceDescriptorGPUVideo(const SurfaceDescr
}), NS_DISPATCH_NORMAL);
}
void
VideoDecoderManagerChild::FatalError(const char* const aName, const char* const aMsg) const
{
dom::ContentChild::FatalErrorIfNotUsingGPUProcess(aName, aMsg, OtherPid());
}
} // namespace dom
} // namespace mozilla

2
dom/media/ipc/VideoDecoderManagerChild.h
View File

@ -26,6 +26,8 @@ public:
void DeallocPVideoDecoderManagerChild() override;
void FatalError(const char* const aName, const char* const aMsg) const override;
// Main thread only
static void Initialize();
static void Shutdown();

3
dom/plugins/ipc/PluginModuleChild.cpp
View File

@ -32,6 +32,7 @@
#include "mozilla/plugins/BrowserStreamChild.h"
#include "mozilla/plugins/PluginStreamChild.h"
#include "mozilla/dom/CrashReporterChild.h"
#include "mozilla/Sprintf.h"
#include "mozilla/Unused.h"
#include "nsNPAPIPlugin.h"
@ -265,7 +266,7 @@ PluginModuleChild::InitForChrome(const std::string& aPluginFilename,
#if defined(XP_MACOSX)
const char* namePrefix = "Plugin Content";
char nameBuffer[80];
snprintf(nameBuffer, sizeof(nameBuffer), "%s (%s)", namePrefix, info.fName);
SprintfLiteral(nameBuffer, "%s (%s)", namePrefix, info.fName);
mozilla::plugins::PluginUtilsOSX::SetProcessName(nameBuffer);
#endif
pluginFile.FreePluginInfo(info);

7
dom/plugins/ipc/PluginUtilsOSX.mm
View File

@ -15,6 +15,8 @@
#include "nsDebug.h"
#include "mozilla/Sprintf.h"
@interface CALayer (ContentsScale)
- (double)contentsScale;
- (void)setContentsScale:(double)scale;
@ -222,12 +224,11 @@ bool mozilla::plugins::PluginUtilsOSX::SetProcessName(const char* aProcessName)
return false;
}
NSString *currentName = [[[NSBundle mainBundle] localizedInfoDictionary]
NSString *currentName = [[[NSBundle mainBundle] localizedInfoDictionary]
objectForKey:(NSString *)kCFBundleNameKey];
char formattedName[1024];
snprintf(formattedName, sizeof(formattedName),
"%s %s", [currentName UTF8String], aProcessName);
SprintfLiteral(formattedName, "%s %s", [currentName UTF8String], aProcessName);
aProcessName = formattedName;

2
dom/presentation/PresentationRequest.cpp
View File

@ -206,6 +206,7 @@ PresentationRequest::StartWithDevice(const nsAString& aDeviceId,
// process.
nsCOMPtr<nsIDOMEventTarget> handler =
do_QueryInterface(GetOwner()->GetChromeEventHandler());
nsCOMPtr<nsIPrincipal> principal = doc->NodePrincipal();
nsCOMPtr<nsIPresentationServiceCallback> callback =
new PresentationRequesterCallback(this, id, promise);
nsCOMPtr<nsIPresentationTransportBuilderConstructor> constructor =
@ -216,6 +217,7 @@ PresentationRequest::StartWithDevice(const nsAString& aDeviceId,
aDeviceId,
GetOwner()->WindowID(),
handler,
principal,
callback,
constructor);
if (NS_WARN_IF(NS_FAILED(rv))) {

14
dom/presentation/PresentationService.cpp
View File

@ -113,6 +113,7 @@ public:
const nsAString& aOrigin,
uint64_t aWindowId,
nsIDOMEventTarget* aEventTarget,
nsIPrincipal* aPrincipal,
nsIPresentationServiceCallback* aCallback,
nsIPresentationTransportBuilderConstructor* aBuilderConstructor);
@ -126,6 +127,7 @@ private:
nsString mOrigin;
uint64_t mWindowId;
nsWeakPtr mChromeEventHandler;
nsCOMPtr<nsIPrincipal> mPrincipal;
nsCOMPtr<nsIPresentationServiceCallback> mCallback;
nsCOMPtr<nsIPresentationTransportBuilderConstructor> mBuilderConstructor;
};
@ -143,6 +145,7 @@ PresentationDeviceRequest::PresentationDeviceRequest(
const nsAString& aOrigin,
uint64_t aWindowId,
nsIDOMEventTarget* aEventTarget,
nsIPrincipal* aPrincipal,
nsIPresentationServiceCallback* aCallback,
nsIPresentationTransportBuilderConstructor* aBuilderConstructor)
: mRequestUrls(aUrls)
@ -150,6 +153,7 @@ PresentationDeviceRequest::PresentationDeviceRequest(
, mOrigin(aOrigin)
, mWindowId(aWindowId)
, mChromeEventHandler(do_GetWeakReference(aEventTarget))
, mPrincipal(aPrincipal)
, mCallback(aCallback)
, mBuilderConstructor(aBuilderConstructor)
{
@ -181,6 +185,14 @@ PresentationDeviceRequest::GetChromeEventHandler(nsIDOMEventTarget** aChromeEven
return NS_OK;
}
NS_IMETHODIMP
PresentationDeviceRequest::GetPrincipal(nsIPrincipal** aPrincipal)
{
nsCOMPtr<nsIPrincipal> principal(mPrincipal);
principal.forget(aPrincipal);
return NS_OK;
}
NS_IMETHODIMP
PresentationDeviceRequest::Select(nsIPresentationDevice* aDevice)
{
@ -655,6 +667,7 @@ PresentationService::StartSession(
const nsAString& aDeviceId,
uint64_t aWindowId,
nsIDOMEventTarget* aEventTarget,
nsIPrincipal* aPrincipal,
nsIPresentationServiceCallback* aCallback,
nsIPresentationTransportBuilderConstructor* aBuilderConstructor)
{
@ -671,6 +684,7 @@ PresentationService::StartSession(
aOrigin,
aWindowId,
aEventTarget,
aPrincipal,
aCallback,
aBuilderConstructor);

4
dom/presentation/interfaces/nsIPresentationDevicePrompt.idl
View File

@ -7,6 +7,7 @@
interface nsIArray;
interface nsIDOMEventTarget;
interface nsIPresentationDevice;
interface nsIPrincipal;
%{C++
#define PRESENTATION_DEVICE_PROMPT_CONTRACTID "@mozilla.org/presentation-device/prompt;1"
@ -27,6 +28,9 @@ interface nsIPresentationDeviceRequest : nsISupports
// The XUL browser element that the request was originated in.
readonly attribute nsIDOMEventTarget chromeEventHandler;
// The principal of the request.
readonly attribute nsIPrincipal principal;
/*
* Callback after selecting a device
* @param device The selected device.

3
dom/presentation/interfaces/nsIPresentationService.idl
View File

@ -11,6 +11,7 @@ interface nsIPresentationAvailabilityListener;
interface nsIPresentationRespondingListener;
interface nsIPresentationSessionListener;
interface nsIPresentationTransportBuilderConstructor;
interface nsIPrincipal;
%{C++
#define PRESENTATION_SERVICE_CID \
@ -70,6 +71,7 @@ interface nsIPresentationService : nsISupports
* @param eventTarget: The chrome event handler, in particular XUL browser
* element in parent process, that the request was
* originated in.
* @param principal: The principal that initiated the session.
* @param callback: Invoke the callback when the operation is completed.
* NotifySuccess() is called with |id| if a session is
* established successfully with the selected device.
@ -82,6 +84,7 @@ interface nsIPresentationService : nsISupports
in DOMString deviceId,
in unsigned long long windowId,
in nsIDOMEventTarget eventTarget,
in nsIPrincipal principal,
in nsIPresentationServiceCallback callback,
in nsIPresentationTransportBuilderConstructor constructor);

2
dom/presentation/ipc/PPresentation.ipdl
View File

@ -10,6 +10,7 @@ include protocol PPresentationBuilder;
include InputStreamParams;
using class IPC::Principal from "mozilla/dom/PermissionMessageUtils.h";
using mozilla::dom::TabId from "mozilla/dom/ipc/IdType.h";
namespace mozilla {
@ -23,6 +24,7 @@ struct StartSessionRequest
nsString deviceId;
uint64_t windowId;
TabId tabId;
Principal principal;
};
struct SendSessionMessageRequest

5
dom/presentation/ipc/PresentationIPCService.cpp
View File

@ -5,6 +5,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/dom/ContentChild.h"
#include "mozilla/dom/PermissionMessageUtils.h"
#include "mozilla/dom/PPresentation.h"
#include "mozilla/dom/TabParent.h"
#include "mozilla/ipc/InputStreamUtils.h"
@ -60,6 +61,7 @@ PresentationIPCService::StartSession(
const nsAString& aDeviceId,
uint64_t aWindowId,
nsIDOMEventTarget* aEventTarget,
nsIPrincipal* aPrincipal,
nsIPresentationServiceCallback* aCallback,
nsIPresentationTransportBuilderConstructor* aBuilderConstructor)
{
@ -78,7 +80,8 @@ PresentationIPCService::StartSession(
nsString(aOrigin),
nsString(aDeviceId),
aWindowId,
tabId));
tabId,
IPC::Principal(aPrincipal)));
}
NS_IMETHODIMP

3
dom/presentation/ipc/PresentationParent.cpp
View File

@ -403,7 +403,8 @@ PresentationRequestParent::DoRequest(const StartSessionRequest& aRequest)
new PresentationTransportBuilderConstructorIPC(parent);
return mService->StartSession(aRequest.urls(), aRequest.sessionId(),
aRequest.origin(), aRequest.deviceId(),
aRequest.windowId(), eventTarget, this, constructor);
aRequest.windowId(), eventTarget,
aRequest.principal(), this, constructor);
}
nsresult

11
dom/security/test/sri/iframe_require-sri-for_main.html
View File

@ -34,7 +34,14 @@
<p id="black-text">black text</p>
<script>
window.onload = function() {
parent.postMessage("finish", '*');
// this worker should not load,
// given that we can not provide integrity metadata through the constructor
w = new Worker("rsf_worker.js");
w.onerror = function(e) {
if (typeof w == "object") {
parent.postMessage("finish", '*');
} else {
parent.postMessage("error", "*")
}
}
</script>

5
dom/security/test/sri/iframe_require-sri-for_no_csp.html Normal file
View File

@ -0,0 +1,5 @@
<script>
w = new Worker("rsf_csp_worker.js");
// use the handler function in the parent frame (test_require-sri-for_csp_directive.html)
w.onmessage = parent.handler;
</script>

5
dom/security/test/sri/mochitest.ini
View File

@ -3,11 +3,16 @@ support-files =
file_bug_1271796.css
iframe_require-sri-for_main.html
iframe_require-sri-for_main.html^headers^
iframe_require-sri-for_no_csp.html
iframe_script_crossdomain.html
iframe_script_sameorigin.html
iframe_sri_disabled.html
iframe_style_crossdomain.html
iframe_style_sameorigin.html
rsf_csp_worker.js
rsf_csp_worker.js^headers^
rsf_imported.js
rsf_worker.js
script_crossdomain1.js
script_crossdomain1.js^headers^
script_crossdomain2.js

9
dom/security/test/sri/rsf_csp_worker.js Normal file
View File

@ -0,0 +1,9 @@
postMessage("good_worker_could_load");
try {
importScripts('rsf_imported.js');
} catch(e) {
postMessage("good_worker_after_importscripts");
}
finally {
postMessage("finish");
}

1
dom/security/test/sri/rsf_csp_worker.js^headers^ Normal file
View File

@ -0,0 +1 @@
content-security-policy: require-sri-for script style

1
dom/security/test/sri/rsf_imported.js Normal file
View File

@ -0,0 +1 @@
postMessage('bad_worker_could_load_via_importScripts');

3
dom/security/test/sri/rsf_spawn_CSPd_worker.js Normal file
View File

@ -0,0 +1,3 @@
w = new Worker("rsf_csp_worker.js");
// use the handler function in test_require-sri-for_csp_directive.html
w.onmessage = parent.handler;

2
dom/security/test/sri/rsf_worker.js Normal file
View File

@ -0,0 +1,2 @@
parent.postMessage('bad_worker_could_load', '*');
importScripts('rsf_imported.js');

38
dom/security/test/sri/test_require-sri-for_csp_directive.html
View File

@ -10,10 +10,12 @@
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1265318">Mozilla Bug 1265318</a>
<iframe style="width:200px;height:200px;" id="test_frame"></iframe>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1265318">Mozilla Bug 1265318</a><br>
<iframe style="width:200px;height:200px;" id="test_frame"></iframe><br>
<iframe style="width:200px;height:200px;" id="test_frame_no_csp"></iframe>
</body>
<script type="application/javascript">
var finished = 0;
SpecialPowers.setBoolPref("security.csp.experimentalEnabled", true);
SimpleTest.waitForExplicitFinish();
function handler(event) {
@ -33,12 +35,29 @@
case 'good_svg_nonsriBlocked':
ok(true, 'Eligible non-SRI svg script was correctly blocked by the CSP.');
break;
case 'bad_worker_could_load':
ok(false, 'require-sri-for failed to block loading a Worker with no integrity metadata.');
break;
case 'good_worker_could_load':
ok(true, "Loaded a worker that has require-sri-for set (but its parent doesnt).")
break;
case 'bad_worker_could_load_via_importScripts':
ok(false, 'require-sri-for failed to block loading importScript in a worker though we require SRI via CSP');
break;
case 'good_worker_after_importscripts':
ok(true, 'Worker continued after failed importScript due to require-sri-for');
break;
case 'finish':
var blackText = frame.contentDocument.getElementById('black-text');
var blackTextColor = frame.contentWindow.getComputedStyle(blackText, null).getPropertyValue('color');
ok(blackTextColor == 'rgb(0, 0, 0)', "The second part should not be black.");
removeEventListener('message', handler);
SimpleTest.finish();
finished++;
if (finished > 1) {
// need finish message from iframe_require-sri-for_main onload event and
// from iframe_require-sri-for_no_csp, which spawns a Worker
var blackText = frame.contentDocument.getElementById('black-text');
var blackTextColor = frame.contentWindow.getComputedStyle(blackText, null).getPropertyValue('color');
ok(blackTextColor == 'rgb(0, 0, 0)', "The second part should not be black.");
removeEventListener('message', handler);
SimpleTest.finish();
}
break;
default:
ok(false, 'Something is wrong here');
@ -46,7 +65,12 @@
}
}
addEventListener("message", handler);
// This frame has a CSP that requires SRI
var frame = document.getElementById("test_frame");
frame.src = "iframe_require-sri-for_main.html";
// This frame has no CSP to require SRI.
// Used for testing require-sri-for in a Worker.
var frame_no_csp = document.getElementById("test_frame_no_csp");
frame_no_csp.src = "iframe_require-sri-for_no_csp.html";
</script>
</html>

4
dom/workers/RuntimeService.cpp
View File

@ -2365,7 +2365,7 @@ RuntimeService::SuspendWorkersForWindow(nsPIDOMWindowInner* aWindow)
GetWorkersForWindow(aWindow, workers);
for (uint32_t index = 0; index < workers.Length(); index++) {
workers[index]->Suspend();
workers[index]->ParentWindowPaused();
}
}
@ -2379,7 +2379,7 @@ RuntimeService::ResumeWorkersForWindow(nsPIDOMWindowInner* aWindow)
GetWorkersForWindow(aWindow, workers);
for (uint32_t index = 0; index < workers.Length(); index++) {
workers[index]->Resume();
workers[index]->ParentWindowResumed();
}
}

23
dom/workers/ScriptLoader.cpp
View File

@ -59,6 +59,7 @@
#include "mozilla/dom/PromiseNativeHandler.h"
#include "mozilla/dom/Response.h"
#include "mozilla/dom/ScriptSettings.h"
#include "mozilla/dom/SRILogHelper.h"
#include "mozilla/UniquePtr.h"
#include "Principal.h"
#include "WorkerHolder.h"
@ -1110,6 +1111,25 @@ private:
aLoadInfo.mURL.Assign(NS_ConvertUTF8toUTF16(filename));
}
nsCOMPtr<nsILoadInfo> chanLoadInfo = channel->GetLoadInfo();
if (chanLoadInfo && chanLoadInfo->GetEnforceSRI()) {
// importScripts() and the Worker constructor do not support integrity metadata
// (or any fetch options). Until then, we can just block.
// If we ever have those data in the future, we'll have to the check to
// by using the SRICheck module
MOZ_LOG(SRILogHelper::GetSriLog(), mozilla::LogLevel::Debug,
("Scriptloader::Load, SRI required but not supported in workers"));
nsCOMPtr<nsIContentSecurityPolicy> wcsp;
chanLoadInfo->LoadingPrincipal()->GetCsp(getter_AddRefs(wcsp));
MOZ_ASSERT(wcsp, "We sould have a CSP for the worker here");
if (wcsp) {
wcsp->LogViolationDetails(
nsIContentSecurityPolicy::VIOLATION_TYPE_REQUIRE_SRI_FOR_SCRIPT,
aLoadInfo.mURL, EmptyString(), 0, EmptyString(), EmptyString());
}
return NS_ERROR_SRI_CORRUPT;
}
// Update the principal of the worker and its base URI if we just loaded the
// worker's primary script.
if (IsMainWorkerScript()) {
@ -1215,7 +1235,8 @@ private:
rv = csp->GetReferrerPolicy(&rp, &hasReferrerPolicy);
NS_ENSURE_SUCCESS(rv, rv);
if (hasReferrerPolicy) {
if (hasReferrerPolicy) { //FIXME bug 1307366: move RP out of CSP code
mWorkerPrivate->SetReferrerPolicy(static_cast<net::ReferrerPolicy>(rp));
}
}

31
dom/workers/WorkerPrivate.cpp
View File

@ -760,7 +760,8 @@ private:
return true;
}
if (aWorkerPrivate->IsFrozen() || aWorkerPrivate->IsSuspended()) {
if (aWorkerPrivate->IsFrozen() ||
aWorkerPrivate->IsParentWindowPaused()) {
MOZ_ASSERT(!IsDebuggerRunnable());
aWorkerPrivate->QueueRunnable(this);
return true;
@ -1159,7 +1160,8 @@ private:
else {
AssertIsOnMainThread();
if (aWorkerPrivate->IsFrozen() || aWorkerPrivate->IsSuspended()) {
if (aWorkerPrivate->IsFrozen() ||
aWorkerPrivate->IsParentWindowPaused()) {
MOZ_ASSERT(!IsDebuggerRunnable());
aWorkerPrivate->QueueRunnable(this);
return true;
@ -2179,7 +2181,7 @@ WorkerPrivateParent<Derived>::WorkerPrivateParent(
mParent(aParent), mScriptURL(aScriptURL),
mWorkerName(aWorkerName), mLoadingWorkerScript(false),
mBusyCount(0), mParentStatus(Pending), mParentFrozen(false),
mParentSuspended(false), mIsChromeWorker(aIsChromeWorker),
mParentWindowPaused(false), mIsChromeWorker(aIsChromeWorker),
mMainThreadObjectsForgotten(false), mWorkerType(aWorkerType),
mCreationTimeStamp(TimeStamp::Now()),
mCreationTimeHighRes((double)PR_Now() / PR_USEC_PER_MSEC)
@ -2637,7 +2639,7 @@ WorkerPrivateParent<Derived>::Thaw(nsPIDOMWindowInner* aWindow)
// Execute queued runnables before waking up the worker, otherwise the worker
// could post new messages before we run those that have been queued.
if (!IsSuspended() && !mQueuedRunnables.IsEmpty()) {
if (!IsParentWindowPaused() && !mQueuedRunnables.IsEmpty()) {
AssertIsOnMainThread();
MOZ_ASSERT(IsDedicatedWorker());
@ -2660,24 +2662,24 @@ WorkerPrivateParent<Derived>::Thaw(nsPIDOMWindowInner* aWindow)
template <class Derived>
void
WorkerPrivateParent<Derived>::Suspend()
WorkerPrivateParent<Derived>::ParentWindowPaused()
{
AssertIsOnMainThread();
MOZ_ASSERT(!mParentSuspended, "Suspended more than once!");
MOZ_ASSERT(!mParentWindowPaused, "Suspended more than once!");
mParentSuspended = true;
mParentWindowPaused = true;
}
template <class Derived>
void
WorkerPrivateParent<Derived>::Resume()
WorkerPrivateParent<Derived>::ParentWindowResumed()
{
AssertIsOnMainThread();
MOZ_ASSERT(mParentSuspended, "Resumed more than once!");
MOZ_ASSERT(mParentWindowPaused, "Resumed more than once!");
mParentSuspended = false;
mParentWindowPaused = false;
{
MutexAutoLock lock(mMutex);
@ -5104,6 +5106,11 @@ WorkerPrivate::FreezeInternal()
NS_ASSERTION(!mFrozen, "Already frozen!");
mFrozen = true;
for (uint32_t index = 0; index < mChildWorkers.Length(); index++) {
mChildWorkers[index]->Freeze(nullptr);
}
return true;
}
@ -5114,6 +5121,10 @@ WorkerPrivate::ThawInternal()
NS_ASSERTION(mFrozen, "Not yet frozen!");
for (uint32_t index = 0; index < mChildWorkers.Length(); index++) {
mChildWorkers[index]->Thaw(nullptr);
}
mFrozen = false;
return true;
}

13
dom/workers/WorkerPrivate.h
View File

@ -199,7 +199,7 @@ private:
uint64_t mBusyCount;
Status mParentStatus;
bool mParentFrozen;
bool mParentSuspended;
bool mParentWindowPaused;
bool mIsChromeWorker;
bool mMainThreadObjectsForgotten;
WorkerType mWorkerType;
@ -323,11 +323,14 @@ public:
bool
Thaw(nsPIDOMWindowInner* aWindow);
// When we debug a worker, we want to disconnect the window and the worker
// communication. This happens calling this method.
// Note: this method doesn't suspend the worker! Use Freeze/Thaw instead.
void
Suspend();
ParentWindowPaused();
void
Resume();
ParentWindowResumed();
bool
Terminate()
@ -425,10 +428,10 @@ public:
}
bool
IsSuspended() const
IsParentWindowPaused() const
{
AssertIsOnParentThread();
return mParentSuspended;
return mParentWindowPaused;
}
bool

3
dom/workers/test/mochitest.ini
View File

@ -105,6 +105,8 @@ support-files =
worker_setTimeoutWith0.js
worker_bug1301094.js
script_bug1301094.js
worker_suspended.js
window_suspended.html
!/dom/base/test/file_websocket_basic_wsh.py
!/dom/base/test/file_websocket_hello_wsh.py
!/dom/base/test/file_websocket_http_resource.txt
@ -230,3 +232,4 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 982828
[test_bug1278777.html]
[test_setTimeoutWith0.html]
[test_bug1301094.html]
[test_subworkers_suspended.html]

135
dom/workers/test/test_subworkers_suspended.html Normal file
View File

@ -0,0 +1,135 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Test for sub workers+bfcache behavior</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<script type="application/javascript">
const WORKER_URL = "worker_suspended.js";
const SUB_WORKERS = 3
var testUrl1 = "window_suspended.html?page1Shown";
var testUrl2 = "window_suspended.html?page2Shown";
var testWin;
var counter = 0;
function cacheData() {
return caches.open("test")
.then(function(cache) {
return cache.match("http://mochi.test:888/foo");
})
.then(function(response) {
return response.text();
});
}
function page1Shown(e) {
info("Page1Shown: " + testWin.location.href);
// First time this page is shown.
if (counter == 0) {
ok(!e.persisted, "test page should have been persisted initially");
info("Create a worker and subworkers...");
let worker = new e.target.defaultView.Worker(WORKER_URL);
var promise = new Promise((resolve, reject) => {
info("Waiting until workers are ready...");
worker.addEventListener("message", function onmessage(e) {
is(e.data, "ready", "We want to receive: -ready-");
worker.removeEventListener("message", onmessage);
resolve();
});
worker.postMessage({ type: "page1", count: SUB_WORKERS });
});
promise.then(function() {
info("Retrieving data from cache...");
return cacheData();
})
.then(function(content) {
is(content.indexOf("page1-"), 0, "We have data from the worker");
})
.then(function() {
info("New location: " + testUrl2);
testWin.location.href = testUrl2;
});
} else {
is(e.persisted, true, "test page should have been persisted in pageshow");
var promise = new Promise((resolve, reject) => {
info("Waiting 2 seconds...");
setTimeout(resolve, 2000);
});
promise.then(function() {
info("Retrieving data from cache...");
return cacheData();
})
.then(function(content) {
is(content.indexOf("page1-"), 0, "We have data from the worker");
})
.then(function() {
testWin.close();
SimpleTest.finish();
});
}
counter++;
}
function page2Shown(e) {
info("Page2Shown: " + testWin.location.href);
info("Create a worker...");
let worker = new e.target.defaultView.Worker(WORKER_URL);
var promise = new Promise((resolve, reject) => {
info("Waiting until workers are ready...");
worker.addEventListener("message", function onmessage(e) {
is(e.data, "ready", "We want to receive: -ready-");
worker.removeEventListener("message", onmessage);
resolve();
});
worker.postMessage({ type: "page2" });
});
promise.then(function() {
info("Retrieving data from cache...");
return cacheData();
})
.then(function(content) {
is(content, "page2-0", "We have data from the second worker");
})
.then(function() {
info("Going back");
testWin.history.back();
});
}
SpecialPowers.pushPrefEnv({ set: [
["dom.caches.enabled", true],
["dom.caches.testing.enabled", true],
] },
function() {
testWin = window.open(testUrl1);
});
SimpleTest.waitForExplicitFinish();
SimpleTest.requestFlakyTimeout("untriaged");
</script>
</body>
</html>

5
dom/workers/test/window_suspended.html Normal file
View File

@ -0,0 +1,5 @@
<script>
onpageshow = function(e) {
opener[location.search.split('?')[1]](e);
}
</script>

31
dom/workers/test/worker_suspended.js Normal file
View File

@ -0,0 +1,31 @@
var count = 0;
function do_magic(data) {
caches.open("test")
.then(function(cache) {
return cache.put("http://mochi.test:888/foo", new Response(data.type + "-" + count++));
})
.then(function() {
if (count == 1) {
postMessage("ready");
}
if (data.loop) {
setTimeout(function() {do_magic(data); }, 500);
}
});
}
onmessage = function(e) {
if (e.data.type == 'page1') {
if (e.data.count > 0) {
var a = new Worker("worker_suspended.js");
a.postMessage({ type: "page1", count: e.data - 1 });
a.onmessage = function() { postMessage("ready"); }
} else {
do_magic({ type: e.data.type, loop: true });
}
} else if (e.data.type == 'page2') {
do_magic({ type: e.data.type, loop: false });
}
}

4
embedding/browser/nsWebBrowser.cpp
View File

@ -245,8 +245,8 @@ nsWebBrowser::RemoveWebBrowserListener(nsIWeakReference* aListener,
// iterate the array and remove the queued listener
int32_t count = mListenerArray->Length();
while (count > 0) {
if (mListenerArray->ElementAt(count).Equals(aListener, aIID)) {
mListenerArray->RemoveElementAt(count);
if (mListenerArray->ElementAt(count-1).Equals(aListener, aIID)) {
mListenerArray->RemoveElementAt(count-1);
break;
}
count--;

7
gfx/ipc/VsyncBridgeChild.cpp
View File

@ -5,6 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "VsyncBridgeChild.h"
#include "VsyncIOThreadHolder.h"
#include "mozilla/dom/ContentChild.h"
namespace mozilla {
namespace gfx {
@ -138,5 +139,11 @@ VsyncBridgeChild::ProcessingError(Result aCode, const char* aReason)
MOZ_RELEASE_ASSERT(aCode == MsgDropped, "Processing error in VsyncBridgeChild");
}
void
VsyncBridgeChild::FatalError(const char* const aName, const char* const aMsg) const
{
dom::ContentChild::FatalErrorIfNotUsingGPUProcess(aName, aMsg, OtherPid());
}
} // namespace gfx
} // namespace mozilla

2
gfx/ipc/VsyncBridgeChild.h
View File

@ -33,6 +33,8 @@ public:
void NotifyVsync(TimeStamp aTimeStamp, const uint64_t& aLayersId);
virtual void FatalError(const char* const aName, const char* const aMsg) const override;
private:
VsyncBridgeChild(RefPtr<VsyncIOThreadHolder>, const uint64_t& aProcessToken);
~VsyncBridgeChild();

26
gfx/layers/apz/util/APZEventState.cpp
View File

@ -230,17 +230,15 @@ APZEventState::FireContextmenuEvents(const nsCOMPtr<nsIPresShell>& aPresShell,
// If the contextmenu event was handled then we're showing a contextmenu,
// and so we should remove any activation
mActiveElementManager->ClearActivation();
#ifndef XP_WIN
} else {
// If no one handle context menu, fire MOZLONGTAP event
LayoutDevicePoint ldPoint = aPoint * aScale;
int time = 0;
nsEventStatus status =
APZCCallbackHelper::DispatchSynthesizedMouseEvent(eMouseLongTap, time,
ldPoint, aModifiers,
/*clickCount*/ 1,
aWidget);
// If the contextmenu wasn't consumed, fire the eMouseLongTap event.
nsEventStatus status = APZCCallbackHelper::DispatchSynthesizedMouseEvent(
eMouseLongTap, /*time*/ 0, aPoint * aScale, aModifiers,
/*clickCount*/ 1, aWidget);
eventHandled = (status == nsEventStatus_eConsumeNoDefault);
APZES_LOG("MOZLONGTAP event handled: %d\n", eventHandled);
APZES_LOG("eMouseLongTap event handled: %d\n", eventHandled);
#endif
}
return eventHandled;
@ -266,8 +264,14 @@ APZEventState::ProcessLongTap(const nsCOMPtr<nsIPresShell>& aPresShell,
#ifdef XP_WIN
// On Windows, we fire the contextmenu events when the user lifts their
// finger, in keeping with the platform convention. This happens in the
// ProcessLongTapUp function.
bool eventHandled = false;
// ProcessLongTapUp function. However, we still fire the eMouseLongTap event
// at this time, because things like text selection or dragging may want
// to know about it.
nsEventStatus status = APZCCallbackHelper::DispatchSynthesizedMouseEvent(
eMouseLongTap, /*time*/ 0, aPoint * aScale, aModifiers, /*clickCount*/ 1,
widget);
bool eventHandled = (status == nsEventStatus_eConsumeNoDefault);
#else
bool eventHandled = FireContextmenuEvents(aPresShell, aPoint, aScale,
aModifiers, widget);

9
gfx/layers/composite/PaintCounter.cpp
View File

@ -48,11 +48,10 @@ PaintCounter::~PaintCounter()
void
PaintCounter::Draw(Compositor* aCompositor, TimeDuration aPaintTime, TimeDuration aCompositeTime) {
const int buffer_size = 48;
char buffer[buffer_size];
snprintf(buffer, buffer_size, "P: %.2f C: %.2f",
aPaintTime.ToMilliseconds(),
aCompositeTime.ToMilliseconds());
char buffer[48];
SprintfLiteral(buffer, "P: %.2f C: %.2f",
aPaintTime.ToMilliseconds(),
aCompositeTime.ToMilliseconds());
SkPaint paint;
paint.setTextSize(32);

7
gfx/layers/ipc/CompositorBridgeChild.cpp
View File

@ -33,6 +33,7 @@
#include "FrameLayerBuilder.h"
#include "mozilla/dom/TabChild.h"
#include "mozilla/dom/TabParent.h"
#include "mozilla/dom/ContentChild.h"
#include "mozilla/Unused.h"
#include "mozilla/DebugOnly.h"
#if defined(XP_WIN)
@ -1144,6 +1145,12 @@ CompositorBridgeChild::WillEndTransaction()
ResetShmemCounter();
}
void
CompositorBridgeChild::FatalError(const char* const aName, const char* const aMsg) const
{
dom::ContentChild::FatalErrorIfNotUsingGPUProcess(aName, aMsg, OtherPid());
}
} // namespace layers
} // namespace mozilla

2
gfx/layers/ipc/CompositorBridgeChild.h
View File

@ -134,6 +134,8 @@ public:
TextureFlags aFlags,
uint64_t aSerial) override;
virtual void FatalError(const char* const aName, const char* const aMsg) const override;
/**
* Request that the parent tell us when graphics are ready on GPU.
* When we get that message, we bounce it to the TabParent via

7
gfx/layers/ipc/ImageBridgeChild.cpp
View File

@ -32,6 +32,7 @@
#include "mozilla/layers/LayersMessages.h" // for CompositableOperation
#include "mozilla/layers/PCompositableChild.h" // for PCompositableChild
#include "mozilla/layers/TextureClient.h" // for TextureClient
#include "mozilla/dom/ContentChild.h"
#include "mozilla/mozalloc.h" // for operator new, etc
#include "mtransport/runnable_utils.h"
#include "nsContentUtils.h"
@ -1477,5 +1478,11 @@ ImageBridgeChild::CanSend() const
return mCanSend;
}
void
ImageBridgeChild::FatalError(const char* const aName, const char* const aMsg) const
{
dom::ContentChild::FatalErrorIfNotUsingGPUProcess(aName, aMsg, OtherPid());
}
} // namespace layers
} // namespace mozilla

2
gfx/layers/ipc/ImageBridgeChild.h
View File

@ -370,6 +370,8 @@ public:
return InImageBridgeChildThread();
}
virtual void FatalError(const char* const aName, const char* const aMsg) const override;
protected:
ImageBridgeChild();
bool DispatchAllocShmemInternal(size_t aSize,

7
gfx/vr/ipc/VRManagerChild.cpp
View File

@ -13,6 +13,7 @@
#include "mozilla/dom/Navigator.h"
#include "mozilla/dom/VREventObserver.h"
#include "mozilla/dom/WindowBinding.h" // for FrameRequestCallback
#include "mozilla/dom/ContentChild.h"
#include "mozilla/layers/TextureClient.h"
#include "nsContentUtils.h"
@ -566,5 +567,11 @@ VRManagerChild::RemoveListener(dom::VREventObserver* aObserver)
}
}
void
VRManagerChild::FatalError(const char* const aName, const char* const aMsg) const
{
dom::ContentChild::FatalErrorIfNotUsingGPUProcess(aName, aMsg, OtherPid());
}
} // namespace gfx
} // namespace mozilla

2
gfx/vr/ipc/VRManagerChild.h
View File

@ -83,6 +83,8 @@ public:
void FireDOMVRDisplayDisconnectEvent();
void FireDOMVRDisplayPresentChangeEvent();
virtual void FatalError(const char* const aName, const char* const aMsg) const override;
protected:
explicit VRManagerChild();
~VRManagerChild();

2
ipc/app/macbuild/Contents/Info.plist.in
View File

@ -29,5 +29,7 @@
<string>1</string>
<key>NSSupportsAutomaticGraphicsSwitching</key>
<true/>
<key>NSHighResolutionCapable</key>
<true/>
</dict>
</plist>

2
ipc/glue/ProtocolUtils.h
View File

@ -185,6 +185,8 @@ public:
virtual ProcessId OtherPid() const = 0;
virtual MessageChannel* GetIPCChannel() = 0;
virtual void FatalError(const char* const aProtocolName, const char* const aErrorMsg) const = 0;
Maybe<ListenerT*> ReadActor(const IPC::Message* aMessage, PickleIterator* aIter, bool aNullable,
const char* aActorDescription, int32_t aProtocolTypeId);
};

33
ipc/ipdl/ipdl/lower.py
View File

@ -395,13 +395,25 @@ def _protocolErrorBreakpoint(msg):
return StmtExpr(ExprCall(ExprVar('mozilla::ipc::ProtocolErrorBreakpoint'),
args=[ msg ]))
def _ipcFatalError(name, msg, isparent):
def _ipcFatalError(name, msg):
if isinstance(name, str):
name = ExprLiteral.String(name)
if isinstance(msg, str):
msg = ExprLiteral.String(msg)
return StmtExpr(ExprCall(ExprVar('mozilla::ipc::FatalError'),
args=[ name, msg, isparent ]))
return StmtExpr(ExprCall(ExprVar('FatalError'),
args=[ name, msg ]))
def _ipcFatalErrorWithClassname(name, msg, p, isparent):
if isinstance(name, str):
name = ExprLiteral.String(name)
if isinstance(msg, str):
msg = ExprLiteral.String(msg)
if p.decl.type.isToplevel():
return StmtExpr(ExprCall(ExprVar('mozilla::ipc::FatalError'),
args=[ name, msg, isparent ]))
else:
return StmtExpr(ExprCall(ExprSelect(p.managerVar(), '->', 'FatalError'),
[ name, msg ]))
def _printWarningMessage(msg):
if isinstance(msg, str):
@ -3417,7 +3429,6 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
## FatalError()
msgparam = ExprVar('aMsg')
msgvar = ExprVar('formattedMessage')
actorname = _actorName(p.name, self.side)
fatalerror = MethodDefn(MethodDecl(
'FatalError',
@ -3428,10 +3439,22 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
else:
isparent = ExprLiteral.FALSE
fatalerror.addstmts([
_ipcFatalError(actorname, msgparam, isparent)
_ipcFatalError(actorname, msgparam)
])
self.cls.addstmts([ fatalerror, Whitespace.NL ])
protocolnameparam = ExprVar('aProtocolName')
fatalerrorwithclassname = MethodDefn(MethodDecl(
'FatalError',
params=[ Decl(Type('char', const=1, ptrconst=1), protocolnameparam.name),
Decl(Type('char', const=1, ptrconst=1), msgparam.name) ],
const=1))
fatalerrorwithclassname.addstmts([
_ipcFatalErrorWithClassname(protocolnameparam, msgparam, self.protocol, isparent)
])
self.cls.addstmts([ fatalerrorwithclassname, Whitespace.NL ])
## DestroySubtree(bool normal)
whyvar = ExprVar('why')
subtreewhyvar = ExprVar('subtreewhy')

7
js/src/jit/Ion.cpp
View File

@ -2361,6 +2361,13 @@ CheckScript(JSContext* cx, JSScript* script, bool osr)
return false;
}
if (script->nTypeSets() >= UINT16_MAX) {
// In this case multiple bytecode ops can share a single observed
// TypeSet (see bug 1303710).
TrackAndSpewIonAbort(cx, script, "too many typesets");
return false;
}
return true;
}

1
js/src/jit/IonBuilder.cpp
View File

@ -165,6 +165,7 @@ IonBuilder::IonBuilder(JSContext* analysisContext, CompileCompartment* comp,
MOZ_ASSERT(script()->hasBaselineScript() == (info->analysisMode() != Analysis_ArgumentsUsage));
MOZ_ASSERT(!!analysisContext == (info->analysisMode() == Analysis_DefiniteProperties));
MOZ_ASSERT(script_->nTypeSets() < UINT16_MAX);
if (!info->isAnalysis())
script()->baselineScript()->setIonCompiledOrInlined();

3
js/src/jit/IonCaches.cpp
View File

@ -3827,6 +3827,9 @@ GetPropertyIC::tryAttachDenseElement(JSContext* cx, HandleScript outerScript, Io
if (!obj->isNative() || !idval.isInt32())
return true;
if (uint32_t(idval.toInt32()) >= obj->as<NativeObject>().getDenseInitializedLength())
return true;
*emitted = true;
MacroAssembler masm(cx, ion, outerScript, profilerLeavePc_);

14
js/src/jit/MIR.cpp
View File

@ -2736,20 +2736,6 @@ MBinaryBitwiseInstruction::foldsTo(TempAllocator& alloc)
MDefinition*
MBinaryBitwiseInstruction::foldUnnecessaryBitop()
{
// Fold unsigned shift right operator when the second operand is zero and
// the only use is an unsigned modulo. Thus, the expression
// |(x >>> 0) % y| becomes |x % y|.
if (isUrsh() && hasOneDefUse() && getOperand(1)->isConstant()) {
MConstant* constant = getOperand(1)->toConstant();
if (constant->type() == MIRType::Int32 && constant->toInt32() == 0) {
for (MUseDefIterator use(this); use; use++) {
if (use.def()->isMod() && use.def()->toMod()->isUnsigned())
return getOperand(0);
break;
}
}
}
if (specialization_ != MIRType::Int32)
return this;

30
js/src/jit/MIR.h
View File

@ -7139,51 +7139,23 @@ class MDiv : public MBinaryArithInstruction
class MMod : public MBinaryArithInstruction
{
public:
enum class PossiblyUnsigned {
NotPossible,
LHSPossible,
RHSPossible,
BothPossible,
};
protected:
bool unsigned_;
bool canBeNegativeDividend_;
bool canBePowerOfTwoDivisor_;
bool canBeDivideByZero_;
bool trapOnError_;
PossiblyUnsigned possiblyUnsigned_;
MMod(MDefinition* left, MDefinition* right, MIRType type)
: MBinaryArithInstruction(left, right),
unsigned_(false),
canBeNegativeDividend_(true),
canBePowerOfTwoDivisor_(true),
canBeDivideByZero_(true),
trapOnError_(false),
possiblyUnsigned_(PossiblyUnsigned::NotPossible)
trapOnError_(false)
{
if (type != MIRType::Value)
specialization_ = type;
setResultType(type);
if (left->isUrsh() && left->getOperand(1)->isConstant()) {
MConstant* constant = left->getOperand(1)->toConstant();
if (constant->type() == MIRType::Int32 && constant->toInt32() == 0)
possiblyUnsigned_ = PossiblyUnsigned::LHSPossible;
}
if (right->isUrsh() && right->getOperand(1)->isConstant()) {
MConstant* constant = right->getOperand(1)->toConstant();
if (constant->type() == MIRType::Int32 && constant->toInt32() == 0) {
if (possiblyUnsigned_ == PossiblyUnsigned::NotPossible)
possiblyUnsigned_ = PossiblyUnsigned::RHSPossible;
else
possiblyUnsigned_ = PossiblyUnsigned::BothPossible;
}
}
}
public:

29
js/src/jit/RangeAnalysis.cpp
View File

@ -1561,40 +1561,13 @@ MMod::computeRange(TempAllocator& alloc)
// If either operand is a NaN, the result is NaN. This also conservatively
// handles Infinity cases.
if ((possiblyUnsigned_ == PossiblyUnsigned::NotPossible &&
!lhs.hasInt32Bounds()) || !rhs.hasInt32Bounds())
{
if (!lhs.hasInt32Bounds() || !rhs.hasInt32Bounds())
return;
}
// If RHS can be zero, the result can be NaN.
if (rhs.lower() <= 0 && rhs.upper() >= 0)
return;
// (x >>> 0) % y is an unsigned modulo operation but the lhs' range is not
// always >= 0. The lhs range assumes a signed integer 32 bit while the
// value is unsigned 32 bit. That breaks the assumption that range >= 0.
if (specialization() == MIRType::Int32) {
switch (possiblyUnsigned_) {
case PossiblyUnsigned::NotPossible:
break;
case PossiblyUnsigned::LHSPossible:
if (rhs.lower() > 0 && !rhs.canHaveFractionalPart())
unsigned_ = true;
break;
case PossiblyUnsigned::RHSPossible:
if (lhs.lower() >= 0 && !lhs.canHaveFractionalPart())
unsigned_ = true;
break;
case PossiblyUnsigned::BothPossible:
if (lhs.lower() >= 0 && !lhs.canHaveFractionalPart())
unsigned_ = true;
else if (rhs.lower() > 0 && !rhs.canHaveFractionalPart())
unsigned_ = true;
break;
}
}
// If both operands are non-negative integers, we can optimize this to an
// unsigned mod.
if (specialization() == MIRType::Int32 && lhs.lower() >= 0 && rhs.lower() > 0 &&

6
js/src/jsobj.cpp
View File

@ -1860,7 +1860,11 @@ JSObject::fixupAfterMovingGC()
if (is<NativeObject>()) {
NativeObject& obj = as<NativeObject>();
if (obj.denseElementsAreCopyOnWrite()) {
NativeObject* owner = MaybeForwarded(obj.getElementsHeader()->ownerObject().get());
NativeObject* owner = obj.getElementsHeader()->ownerObject();
// Get the new owner pointer but don't call MaybeForwarded as we
// don't need to access the object's shape.
if (IsForwarded(owner))
owner = Forwarded(owner);
if (owner != &obj && owner->hasFixedElements())
obj.elements_ = owner->getElementsHeader()->elements();
MOZ_ASSERT(!IsForwarded(obj.getElementsHeader()->ownerObject().get()));

7
js/src/shell/js.cpp
View File

@ -6839,15 +6839,18 @@ ShellOpenAsmJSCacheEntryForWrite(HandleObject global, bool installed,
CloseHandle(fileMapping);
if (!memory)
return JS::AsmJSCache_InternalError;
MOZ_ASSERT(*(uint32_t*)memory == 0);
#else
memory = mmap(nullptr, serializedSize, PROT_WRITE, MAP_SHARED, fd, 0);
memory = mmap(nullptr, serializedSize, PROT_READ, MAP_SHARED, fd, 0);
if (memory == MAP_FAILED)
return JS::AsmJSCache_InternalError;
MOZ_ASSERT(*(uint32_t*)memory == 0);
if (mprotect(memory, serializedSize, PROT_WRITE))
return JS::AsmJSCache_InternalError;
#endif
// The embedding added the cookie so strip it off of the buffer returned to
// the JS engine. The asmJSCacheCookie will be written on close, below.
MOZ_ASSERT(*(uint32_t*)memory == 0);
*memoryOut = (uint8_t*)memory + sizeof(uint32_t);
*handleOut = fd.forget();
return JS::AsmJSCache_Success;

8
js/xpconnect/src/XPCDebug.cpp
View File

@ -9,6 +9,8 @@
#include "nsThreadUtils.h"
#include "nsContentUtils.h"
#include "mozilla/Sprintf.h"
#ifdef XP_WIN
#include <windows.h>
#endif
@ -20,10 +22,10 @@ static void DebugDump(const char* fmt, ...)
va_start(ap, fmt);
#ifdef XPWIN
_vsnprintf(buffer, sizeof(buffer), fmt, ap);
#else
vsnprintf(buffer, sizeof(buffer), fmt, ap);
#endif
buffer[sizeof(buffer)-1] = '\0';
#else
VsprintfLiteral(buffer, fmt, ap);
#endif
va_end(ap);
#ifdef XP_WIN
if (IsDebuggerPresent()) {

3
js/xpconnect/src/XPCJSContext.cpp
View File

@ -47,6 +47,7 @@
#include "mozilla/Atomics.h"
#include "mozilla/Attributes.h"
#include "mozilla/ProcessHangMonitor.h"
#include "mozilla/Sprintf.h"
#include "mozilla/UniquePtrExtensions.h"
#include "mozilla/Unused.h"
#include "AccessCheck.h"
@ -3528,7 +3529,7 @@ XPCJSContext::DescribeCustomObjects(JSObject* obj, const js::Class* clasp,
return false;
}
snprintf(name, sizeof(name), "JS Object (%s - %s)", clasp->name, si->GetJSClass()->name);
SprintfLiteral(name, "JS Object (%s - %s)", clasp->name, si->GetJSClass()->name);
return true;
}

5
js/xpconnect/src/XPCWrappedJS.cpp
View File

@ -9,6 +9,7 @@
#include "xpcprivate.h"
#include "jsprf.h"
#include "mozilla/DeferredFinalize.h"
#include "mozilla/Sprintf.h"
#include "mozilla/jsipc/CrossProcessObjectWrappers.h"
#include "nsCCUncollectableMarker.h"
#include "nsContentUtils.h"
@ -103,9 +104,9 @@ NS_CYCLE_COLLECTION_CLASSNAME(nsXPCWrappedJS)::Traverse
if (cb.WantDebugInfo()) {
char name[72];
if (tmp->GetClass())
snprintf(name, sizeof(name), "nsXPCWrappedJS (%s)", tmp->GetClass()->GetInterfaceName());
SprintfLiteral(name, "nsXPCWrappedJS (%s)", tmp->GetClass()->GetInterfaceName());
else
snprintf(name, sizeof(name), "nsXPCWrappedJS");
SprintfLiteral(name, "nsXPCWrappedJS");
cb.DescribeRefCountedNode(refcnt, name);
} else {
NS_IMPL_CYCLE_COLLECTION_DESCRIBE(nsXPCWrappedJS, refcnt)

5
js/xpconnect/src/XPCWrappedNative.cpp
View File

@ -23,6 +23,7 @@
#include "mozilla/DeferredFinalize.h"
#include "mozilla/Likely.h"
#include "mozilla/Unused.h"
#include "mozilla/Sprintf.h"
#include "mozilla/dom/BindingUtils.h"
#include <algorithm>
@ -51,9 +52,9 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(XPCWrappedNative)
char name[72];
XPCNativeScriptableInfo* si = tmp->GetScriptableInfo();
if (si)
snprintf(name, sizeof(name), "XPCWrappedNative (%s)", si->GetJSClass()->name);
SprintfLiteral(name, "XPCWrappedNative (%s)", si->GetJSClass()->name);
else
snprintf(name, sizeof(name), "XPCWrappedNative");
SprintfLiteral(name, "XPCWrappedNative");
cb.DescribeRefCountedNode(tmp->mRefCnt.get(), name);
} else {

2
layout/base/AccessibleCaretEventHub.cpp
View File

@ -382,7 +382,7 @@ MOZ_IMPL_STATE_CLASS_GETTER(ScrollState)
MOZ_IMPL_STATE_CLASS_GETTER(PostScrollState)
MOZ_IMPL_STATE_CLASS_GETTER(LongTapState)
bool AccessibleCaretEventHub::sUseLongTapInjector = true;
bool AccessibleCaretEventHub::sUseLongTapInjector = false;
AccessibleCaretEventHub::AccessibleCaretEventHub(nsIPresShell* aPresShell)
: mPresShell(aPresShell)

1
layout/base/tests/marionette/test_accessiblecaret_selection_mode.py
View File

@ -50,7 +50,6 @@ class AccessibleCaretSelectionModeTestCase(MarionetteTestCase):
self.carets_tested_pref = 'layout.accessiblecaret.enabled'
self.prefs = {
'layout.word_select.eat_space_to_next_word': False,
'layout.accessiblecaret.use_long_tap_injector': False,
self.carets_tested_pref: True,
}
self.marionette.set_prefs(self.prefs)

4
layout/style/nsCSSProps.h
View File

@ -340,7 +340,7 @@ public:
// KTableEntry objects can be initialized either with an int16_t value
// or a value of an enumeration type that can fit within an int16_t.
KTableEntry(nsCSSKeyword aKeyword, int16_t aValue)
constexpr KTableEntry(nsCSSKeyword aKeyword, int16_t aValue)
: mKeyword(aKeyword)
, mValue(aValue)
{
@ -348,7 +348,7 @@ public:
template<typename T,
typename = typename std::enable_if<std::is_enum<T>::value>::type>
KTableEntry(nsCSSKeyword aKeyword, T aValue)
constexpr KTableEntry(nsCSSKeyword aKeyword, T aValue)
: mKeyword(aKeyword)
, mValue(static_cast<int16_t>(aValue))
{

3
media/mtransport/rlogringbuffer.cpp
View File

@ -16,6 +16,7 @@
#include "mozilla/Assertions.h"
#include "mozilla/Move.h" // Pinch hitting for <utility> and std::move
#include "mozilla/Mutex.h"
#include "mozilla/Sprintf.h"
#include <vector>
extern "C" {
@ -33,7 +34,7 @@ static int ringbuffer_vlog(int facility,
// I could be evil and printf right into a std::string, but unless this
// shows up in profiling, it is not worth doing.
char temp[4096];
vsnprintf(temp, sizeof(temp), format, ap);
VsprintfLiteral(temp, format, ap);
mozilla::RLogRingBuffer::GetInstance()->Log(std::string(temp));
return 0;

3
media/webrtc/signaling/src/common/browser_logging/CSFLog.cpp
View File

@ -15,6 +15,7 @@
#include "nsThreadUtils.h"
#include "mozilla/Logging.h"
#include "mozilla/Sprintf.h"
static PRLogModuleInfo *gLogModuleInfo = nullptr;
@ -83,7 +84,7 @@ void CSFLogV(CSFLogLevel priority, const char* sourceFile, int sourceLine, const
threadName = "";
}
vsnprintf(message, MAX_MESSAGE_LENGTH, format, args);
VsprintfLiteral(message, format, args);
MOZ_LOG(gLogModuleInfo, level, ("[%s|%s] %s:%d: %s",
threadName, tag, sourceFile, sourceLine,
message));

9
media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
View File

@ -726,7 +726,12 @@ WebrtcVideoConduit::ConfigureSendMediaCodec(const VideoCodecConfig* codecConfig)
video_codec.width = mSendingWidth;
video_codec.height = mSendingHeight;
video_codec.maxFramerate = mSendingFramerate;
} else {
mSendingWidth = 0;
mSendingHeight = 0;
mSendingFramerate = video_codec.maxFramerate;
}
video_codec.mode = mCodecMode;
if(mPtrViECodec->SetSendCodec(mChannel, video_codec) == -1)
@ -756,10 +761,6 @@ WebrtcVideoConduit::ConfigureSendMediaCodec(const VideoCodecConfig* codecConfig)
}
mVideoCodecStat->Register(true);
mSendingWidth = 0;
mSendingHeight = 0;
mSendingFramerate = video_codec.maxFramerate;
// See Bug 1297058, enabling FEC when NACK is set on H.264 is problematic
bool use_fec = codecConfig->RtcpFbFECIsSet();
if ((mExternalSendCodec && codecConfig->mType == mExternalSendCodec->mType)

7
mfbt/Attributes.h
View File

@ -468,6 +468,10 @@
* use `auto` in place of this type in variable declarations. This is intended to
* be used with types which are intended to be implicitly constructed into other
* other types before being assigned to variables.
* MOZ_REQUIRED_BASE_METHOD: Applies to virtual class method declarations.
* Sometimes derived classes override methods that need to be called by their
* overridden counterparts. This marker indicates that the marked method must
* be called by the method that it overrides.
*/
#ifdef MOZ_CLANG_PLUGIN
# define MOZ_MUST_OVERRIDE __attribute__((annotate("moz_must_override")))
@ -501,6 +505,8 @@
__attribute__((annotate("moz_ignore_ctor_initialization")))
# define MOZ_IS_CLASS_INIT \
__attribute__((annotate("moz_is_class_init")))
# define MOZ_REQUIRED_BASE_METHOD \
__attribute__((annotate("moz_required_base_method")))
/*
* It turns out that clang doesn't like void func() __attribute__ {} without a
* warning, so use pragmas to disable the warning. This code won't work on GCC
@ -535,6 +541,7 @@
# define MOZ_INIT_OUTSIDE_CTOR /* nothing */
# define MOZ_IS_CLASS_INIT /* nothing */
# define MOZ_NON_AUTOABLE /* nothing */
# define MOZ_REQUIRED_BASE_METHOD /* nothing */
#endif /* MOZ_CLANG_PLUGIN */
#define MOZ_RAII MOZ_NON_TEMPORARY_CLASS MOZ_STACK_CLASS

3
mobile/android/app/mobile.js
View File

@ -848,9 +848,6 @@ pref("layout.accessiblecaret.margin-left", "-11.5");
// Android needs to show the caret when long tapping on an empty content.
pref("layout.accessiblecaret.caret_shown_when_long_tapping_on_empty_content", true);
// Android generates long tap (mouse) events.
pref("layout.accessiblecaret.use_long_tap_injector", false);
// Androids carets are always tilt to match the text selection guideline.
pref("layout.accessiblecaret.always_tilt", true);

5
mobile/android/base/java/org/mozilla/gecko/push/PushService.java
View File

@ -14,7 +14,6 @@ import android.util.Log;
import org.json.JSONException;
import org.json.JSONObject;
import org.mozilla.gecko.EventDispatcher;
import org.mozilla.gecko.GeckoApp;
import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoProfile;
import org.mozilla.gecko.GeckoService;
@ -246,12 +245,12 @@ public class PushService implements BundleEventListener {
protected void registerGeckoEventListener() {
Log.d(LOG_TAG, "Registered Gecko event listener.");
GeckoApp.getEventDispatcher().registerBackgroundThreadListener(this, GECKO_EVENTS);
EventDispatcher.getInstance().registerBackgroundThreadListener(this, GECKO_EVENTS);
}
protected void unregisterGeckoEventListener() {
Log.d(LOG_TAG, "Unregistered Gecko event listener.");
GeckoApp.getEventDispatcher().unregisterBackgroundThreadListener(this, GECKO_EVENTS);
EventDispatcher.getInstance().unregisterBackgroundThreadListener(this, GECKO_EVENTS);
}
@Override

2
modules/libpref/init/all.js
View File

@ -5238,7 +5238,7 @@ pref("layout.accessiblecaret.timeout_ms", 0);
// Simulate long tap to select words on the platforms where APZ is not enabled
// or long tap events does not fired by APZ.
pref("layout.accessiblecaret.use_long_tap_injector", true);
pref("layout.accessiblecaret.use_long_tap_injector", false);
// By default, carets become tilt only when they are overlapping.
pref("layout.accessiblecaret.always_tilt", false);

1
mozglue/linker/ElfLoader.cpp
View File

@ -479,6 +479,7 @@ ElfLoader::GetMappableFromPath(const char *path)
char *zip_path = strndup(path, subpath - path);
while (*(++subpath) == '/') { }
zip = ZipCollection::GetZip(zip_path);
free(zip_path);
Zip::Stream s;
if (zip && zip->GetStream(subpath, &s)) {
/* When the MOZ_LINKER_EXTRACT environment variable is set to "1",

30
netwerk/base/nsILoadInfo.idl
View File

@ -199,6 +199,18 @@ interface nsILoadInfo : nsISupports
* principal of the parent document. For top-level loads, the
* LoadingPrincipal is null. For all loads except top-level loads
* the LoadingPrincipal is never null.
*
* If the loadingPrincipal is the system principal, no security checks
* will be done at all. There will be no security checks on the initial
* load or any subsequent redirects. This means there will be no
* nsIContentPolicy checks or any CheckLoadURI checks. Because of
* this, never set the loadingPrincipal to the system principal when
* the URI to be loaded is controlled by a webpage.
* If the loadingPrincipal and triggeringPrincipal are both
* codebase-principals, then we will always call into
* nsIContentPolicies and CheckLoadURI. The call to nsIContentPolicies
* and CheckLoadURI happen even if the URI to be loaded is same-origin
* with the loadingPrincipal or triggeringPrincipal.
*/
readonly attribute nsIPrincipal loadingPrincipal;
@ -215,7 +227,7 @@ interface nsILoadInfo : nsISupports
* where that's not true.
*
* For example for loads into an <iframe>, the LoadingPrincipal is always
* the principal of the parent document. However the TriggeringPrincipal
* the principal of the parent document. However the triggeringPrincipal
* is the principal of the document which provided the URL that the
* <iframe> is navigating to. This could be the previous document inside
* the <iframe> which set document.location. Or a document elsewhere in
@ -223,11 +235,23 @@ interface nsILoadInfo : nsISupports
* <iframe>.
*
* If a stylesheet links to a sub-resource, like an @imported stylesheet,
* or a background image, then the TriggeringPrincipal is the principal
* or a background image, then the triggeringPrincipal is the principal
* of the stylesheet, while the LoadingPrincipal is the principal of the
* document being styled.
*
* The TriggeringPrincipal is never null.
* The triggeringPrincipal is never null.
*
* If the triggeringPrincipal is the system principal, no security checks
* will be done at all. There will be no security checks on the initial
* load or any subsequent redirects. This means there will be no
* nsIContentPolicy checks or any CheckLoadURI checks. Because of
* this, never set the triggeringPrincipal to the system principal when
* the URI to be loaded is controlled by a webpage.
* If the loadingPrincipal and triggeringPrincipal are both
* codebase-principals, then we will always call into
* nsIContentPolicies and CheckLoadURI. The call to nsIContentPolicies
* and CheckLoadURI happen even if the URI to be loaded is same-origin
* with the loadingPrincipal or triggeringPrincipal.
*/
readonly attribute nsIPrincipal triggeringPrincipal;

3
netwerk/sctp/datachannel/DataChannel.cpp
View File

@ -36,6 +36,7 @@
#include "nsIObserverService.h"
#include "nsIObserver.h"
#include "mozilla/Services.h"
#include "mozilla/Sprintf.h"
#include "nsProxyRelease.h"
#include "nsThread.h"
#include "nsThreadUtils.h"
@ -196,7 +197,7 @@ debug_printf(const char *format, ...)
#ifdef _WIN32
if (vsnprintf_s(buffer, sizeof(buffer), _TRUNCATE, format, ap) > 0) {
#else
if (vsnprintf(buffer, sizeof(buffer), format, ap) > 0) {
if (VsprintfLiteral(buffer, format, ap) > 0) {
#endif
PR_LogPrint("%s", buffer);
}

19
netwerk/system/linux/nsNotifyAddrListener_Linux.cpp
View File

@ -20,11 +20,12 @@
#include "nsString.h"
#include "mozilla/Logging.h"
#include "mozilla/Services.h"
#include "mozilla/Preferences.h"
#include "mozilla/FileUtils.h"
#include "mozilla/SHA1.h"
#include "mozilla/Base64.h"
#include "mozilla/FileUtils.h"
#include "mozilla/Preferences.h"
#include "mozilla/Services.h"
#include "mozilla/SHA1.h"
#include "mozilla/Sprintf.h"
#include "mozilla/Telemetry.h"
#ifdef MOZ_WIDGET_GONK
@ -139,11 +140,11 @@ void nsNotifyAddrListener::calculateNetworkId(void)
if (gw) {
/* create a string to search for in the arp table */
char searchfor[16];
snprintf(searchfor, sizeof(searchfor), "%d.%d.%d.%d",
gw & 0xff,
(gw >> 8) & 0xff,
(gw >> 16) & 0xff,
gw >> 24);
SprintfLiteral(searchfor, "%d.%d.%d.%d",
gw & 0xff,
(gw >> 8) & 0xff,
(gw >> 16) & 0xff,
gw >> 24);
FILE *farp = fopen(kProcArp, "r");
if (farp) {

21
python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
View File

@ -37,6 +37,10 @@ DEFAULT_CXX_11 = {
'__cplusplus': '201103L',
}
DEFAULT_CXX_14 = {
'__cplusplus': '201402L',
}
SUPPORTS_GNU99 = {
'-std=gnu99': DEFAULT_C99,
}
@ -45,6 +49,10 @@ SUPPORTS_GNUXX11 = {
'-std=gnu++11': DEFAULT_CXX_11,
}
SUPPORTS_CXX14 = {
'-std=c++14': DEFAULT_CXX_14,
}
@memoize
def GCC_BASE(version):
@ -220,12 +228,12 @@ VS_PLATFORM_X86_64 = {
# Note: In reality, the -std=gnu* options are only supported when preceded by
# -Xclang.
CLANG_CL_3_9 = (CLANG_BASE('3.9.0') + VS('18.00.00000') + DEFAULT_C11 +
SUPPORTS_GNU99 + SUPPORTS_GNUXX11) + {
SUPPORTS_GNU99 + SUPPORTS_GNUXX11 + SUPPORTS_CXX14) + {
'*.cpp': {
'__STDC_VERSION__': False,
'__cplusplus': '201103L',
},
'-fms-compatibility-version=18.00.30723': VS('18.00.30723')[None],
'-fms-compatibility-version=19.00.23918': VS('19.00.23918')[None],
}
CLANG_CL_PLATFORM_X86 = FakeCompiler(VS_PLATFORM_X86, GCC_PLATFORM_X86[None])
@ -772,15 +780,16 @@ class WindowsToolchainTest(BaseToolchainTest):
)
CLANG_CL_3_9_RESULT = CompilerResult(
flags=['-Xclang', '-std=gnu99',
'-fms-compatibility-version=18.00.30723', '-fallback'],
version='18.00.30723',
'-fms-compatibility-version=19.00.23918', '-fallback'],
version='19.00.23918',
type='clang-cl',
compiler='/usr/bin/clang-cl',
language='C',
)
CLANGXX_CL_3_9_RESULT = CompilerResult(
flags=['-fms-compatibility-version=18.00.30723', '-fallback'],
version='18.00.30723',
flags=['-Xclang', '-std=c++14',
'-fms-compatibility-version=19.00.23918', '-fallback'],
version='19.00.23918',
type='clang-cl',
compiler='/usr/bin/clang-cl',
language='C++',

5
security/sandbox/linux/SandboxUtil.cpp
View File

@ -17,6 +17,7 @@
#include <unistd.h>
#include "mozilla/Assertions.h"
#include "mozilla/Sprintf.h"
#include "mozilla/Unused.h"
#include "sandbox/linux/system_headers/linux_syscalls.h"
@ -83,7 +84,7 @@ UnshareUserNamespace()
// current thread. However, CLONE_NEWUSER can be unshared only in a
// single-threaded process, so those are equivalent if we reach this
// point.
len = size_t(snprintf(buf, sizeof(buf), "%u %u 1\n", uid, uid));
len = size_t(SprintfLiteral(buf, "%u %u 1\n", uid, uid));
MOZ_ASSERT(len < sizeof(buf));
if (!WriteStringToFile("/proc/self/uid_map", buf, len)) {
MOZ_CRASH("Failed to write /proc/self/uid_map");
@ -91,7 +92,7 @@ UnshareUserNamespace()
Unused << WriteStringToFile("/proc/self/setgroups", "deny", 4);
len = size_t(snprintf(buf, sizeof(buf), "%u %u 1\n", gid, gid));
len = size_t(SprintfLiteral(buf, "%u %u 1\n", gid, gid));
MOZ_ASSERT(len < sizeof(buf));
if (!WriteStringToFile("/proc/self/gid_map", buf, len)) {
MOZ_CRASH("Failed to write /proc/self/gid_map");

3
security/sandbox/linux/broker/SandboxBroker.cpp
View File

@ -29,6 +29,7 @@
#include "mozilla/DebugOnly.h"
#include "mozilla/Move.h"
#include "mozilla/NullPtr.h"
#include "mozilla/Sprintf.h"
#include "mozilla/ipc/FileDescriptor.h"
namespace mozilla {
@ -354,7 +355,7 @@ void
SandboxBroker::ThreadMain(void)
{
char threadName[16];
snprintf(threadName, sizeof(threadName), "FS Broker %d", mChildPid);
SprintfLiteral(threadName, "FS Broker %d", mChildPid);
PlatformThread::SetName(threadName);
// Permissive mode can only be enabled through an environment variable,

4
security/sandbox/moz.build
View File

@ -152,10 +152,6 @@ elif CONFIG['OS_ARCH'] == 'WINNT':
'chromium/sandbox/win/src/Wow64.cc',
]
# Bug 1102853 tracks looking at removing this.
if CONFIG['CPU_ARCH'] == 'x86_64':
SOURCES['chromium/sandbox/win/src/sharedmem_ipc_client.cc'].no_pgo = True
for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM', 'SANDBOX_EXPORTS',
'_CRT_RAND_S', 'CHROMIUM_SANDBOX_BUILD'):
DEFINES[var] = True

2
taskcluster/ci/build/windows.yml
View File

@ -106,7 +106,7 @@ win64/pgo:
job-name:
gecko-v2: win64-pgo
treeherder:
platform: windows2012-64/opt
platform: windows2012-64/pgo
symbol: tc(B)
tier: 2
worker-type: aws-provisioner-v1/gecko-{level}-b-win2012

4
testing/docker/desktop1604-test/Dockerfile
View File

@ -64,10 +64,6 @@ COPY tc-vcs-config.yml /etc/taskcluster-vcs.yml
ADD https://raw.githubusercontent.com/taskcluster/buildbot-step/master/buildbot_step /home/worker/bin/buildbot_step
RUN chmod u+x /home/worker/bin/buildbot_step
# TODO: remove
ADD https://s3-us-west-2.amazonaws.com/test-caching/packages/linux64-stackwalk /usr/local/bin/linux64-minidump_stackwalk
RUN chmod +x /usr/local/bin/linux64-minidump_stackwalk
# allow the worker user to access video devices
RUN usermod -a -G video worker

4
toolkit/components/telemetry/TelemetryEnvironment.jsm
View File

@ -769,7 +769,9 @@ function EnvironmentCache() {
this._currentEnvironment.profile = {};
p.push(this._updateProfile());
p.push(this._updateAttribution());
if (AppConstants.MOZ_BUILD_APP == "browser") {
p.push(this._updateAttribution());
}
let setup = () => {
this._initTask = null;

12
toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
View File

@ -2,7 +2,6 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
Cu.import("resource://gre/modules/AddonManager.jsm");
Cu.import("resource:///modules/AttributionCode.jsm");
Cu.import("resource://gre/modules/TelemetryEnvironment.jsm", this);
Cu.import("resource://gre/modules/Preferences.jsm", this);
Cu.import("resource://gre/modules/PromiseUtils.jsm", this);
@ -12,6 +11,10 @@ Cu.import("resource://testing-common/httpd.js");
Cu.import("resource://testing-common/MockRegistrar.jsm", this);
Cu.import("resource://gre/modules/FileUtils.jsm");
// AttributionCode is only needed for Firefox
XPCOMUtils.defineLazyModuleGetter(this, "AttributionCode",
"resource:///modules/AttributionCode.jsm");
// Lazy load |LightweightThemeManager|, we won't be using it on Gonk.
XPCOMUtils.defineLazyModuleGetter(this, "LightweightThemeManager",
"resource://gre/modules/LightweightThemeManager.jsm");
@ -802,8 +805,11 @@ function run_test() {
Preferences.set("extensions.hotfix.lastVersion", APP_HOTFIX_VERSION);
// Create the attribution data file, so that settings.attribution will exist.
spoofAttributionData();
do_register_cleanup(cleanupAttributionData);
// The attribution functionality only exists in Firefox.
if (AppConstants.MOZ_BUILD_APP == "browser") {
spoofAttributionData();
do_register_cleanup(cleanupAttributionData);
}
run_next_test();
}

5
toolkit/mozapps/update/updater/progressui_gtk.cpp
View File

@ -7,6 +7,7 @@
#include <stdio.h>
#include <gtk/gtk.h>
#include <unistd.h>
#include "mozilla/Sprintf.h"
#include "progressui.h"
#include "readstrings.h"
#include "errors.h"
@ -71,7 +72,7 @@ ShowProgressUI()
return 0;
char ini_path[PATH_MAX];
snprintf(ini_path, sizeof(ini_path), "%s.ini", sProgramPath);
SprintfLiteral(ini_path, "%s.ini", sProgramPath);
StringTable strings;
if (ReadStrings(ini_path, &strings) != OK)
@ -83,7 +84,7 @@ ShowProgressUI()
static GdkPixbuf *pixbuf;
char icon_path[PATH_MAX];
snprintf(icon_path, sizeof(icon_path), "%s.png", sProgramPath);
SprintfLiteral(icon_path, "%s.png", sProgramPath);
g_signal_connect(G_OBJECT(sWin), "delete_event",
G_CALLBACK(OnDeleteEvent), nullptr);

3
toolkit/mozapps/update/updater/progressui_osx.mm
View File

@ -7,6 +7,7 @@
#import <Cocoa/Cocoa.h>
#include <stdio.h>
#include <unistd.h>
#include "mozilla/Sprintf.h"
#include "progressui.h"
#include "readstrings.h"
#include "errors.h"
@ -110,7 +111,7 @@ ShowProgressUI(bool indeterminate)
return 0;
char path[PATH_MAX];
snprintf(path, sizeof(path), "%s/updater.ini", sUpdatePath);
SprintfLiteral(path, "%s/updater.ini", sUpdatePath);
if (ReadStrings(path, &sLabels) != OK)
return -1;

3
tools/profiler/core/platform.cpp
View File

@ -18,6 +18,7 @@
#endif
#include "mozilla/ThreadLocal.h"
#include "mozilla/TimeStamp.h"
#include "mozilla/Sprintf.h"
#include "PseudoStack.h"
#include "GeckoSampler.h"
#ifndef SPS_STANDALONE
@ -429,7 +430,7 @@ mozilla_sampler_log(const char *fmt, va_list args)
char buf[2048];
va_list argsCpy;
VARARGS_ASSIGN(argsCpy, args);
int required = vsnprintf(buf, sizeof(buf), fmt, argsCpy);
int required = VsprintfLiteral(buf, fmt, argsCpy);
va_end(argsCpy);
if (required < 0) {

5
tools/profiler/lul/AutoObjectMapper.cpp
View File

@ -11,6 +11,7 @@
#include <fcntl.h>
#include "mozilla/Assertions.h"
#include "mozilla/Sprintf.h"
#include "PlatformMacros.h"
#include "AutoObjectMapper.h"
@ -43,8 +44,8 @@ failedToMessage(void(*aLog)(const char*),
const char* aHowFailed, std::string aFileName)
{
char buf[300];
snprintf(buf, sizeof(buf), "AutoObjectMapper::Map: Failed to %s \'%s\'",
aHowFailed, aFileName.c_str());
SprintfLiteral(buf, "AutoObjectMapper::Map: Failed to %s \'%s\'",
aHowFailed, aFileName.c_str());
buf[sizeof(buf)-1] = 0;
aLog(buf);
}

7
tools/profiler/lul/LulElf.cpp
View File

@ -59,6 +59,7 @@
#include <vector>
#include "mozilla/Assertions.h"
#include "mozilla/Sprintf.h"
#include "LulPlatformMacros.h"
#include "LulCommonExt.h"
@ -359,7 +360,7 @@ bool LoadSymbols(const string& obj_file,
typedef typename ElfClass::Shdr Shdr;
char buf[500];
snprintf(buf, sizeof(buf), "LoadSymbols: BEGIN %s\n", obj_file.c_str());
SprintfLiteral(buf, "LoadSymbols: BEGIN %s\n", obj_file.c_str());
buf[sizeof(buf)-1] = 0;
log(buf);
@ -369,7 +370,7 @@ bool LoadSymbols(const string& obj_file,
GetOffset<ElfClass, Phdr>(elf_header, elf_header->e_phoff),
elf_header->e_phnum);
uintptr_t text_bias = ((uintptr_t)rx_avma) - loading_addr;
snprintf(buf, sizeof(buf),
SprintfLiteral(buf,
"LoadSymbols: rx_avma=%llx, text_bias=%llx",
(unsigned long long int)(uintptr_t)rx_avma,
(unsigned long long int)text_bias);
@ -434,7 +435,7 @@ bool LoadSymbols(const string& obj_file,
log("LoadSymbols: read CFI from .eh_frame");
}
snprintf(buf, sizeof(buf), "LoadSymbols: END %s\n", obj_file.c_str());
SprintfLiteral(buf, "LoadSymbols: END %s\n", obj_file.c_str());
buf[sizeof(buf)-1] = 0;
log(buf);

7
tools/profiler/public/GeckoProfilerImpl.h
View File

@ -10,9 +10,10 @@
#include <stdlib.h>
#include <signal.h>
#include <stdarg.h>
#include "mozilla/ThreadLocal.h"
#include "mozilla/Assertions.h"
#include "mozilla/GuardObjects.h"
#include "mozilla/Sprintf.h"
#include "mozilla/ThreadLocal.h"
#include "mozilla/UniquePtr.h"
#ifndef SPS_STANDALONE
#include "nscore.h"
@ -443,8 +444,8 @@ public:
// We have to use seperate printf's because we're using
// the vargs.
::vsnprintf(buff, SAMPLER_MAX_STRING, aFormat, args);
::snprintf(mDest, SAMPLER_MAX_STRING, "%s %s", aInfo, buff);
VsprintfLiteral(buff, aFormat, args);
SprintfLiteral(mDest, "%s %s", aInfo, buff);
mHandle = mozilla_sampler_call_enter(mDest, aCategory, this, true, line);
va_end(args);

5
widget/cocoa/nsSandboxViolationSink.mm
View File

@ -12,6 +12,7 @@
#include <notify.h>
#include "nsCocoaDebugUtils.h"
#include "mozilla/Preferences.h"
#include "mozilla/Sprintf.h"
int nsSandboxViolationSink::mNotifyToken = 0;
uint64_t nsSandboxViolationSink::mLastMsgReceived = 0;
@ -59,7 +60,7 @@ nsSandboxViolationSink::ViolationHandler()
// Only get reports that were generated very recently.
char query_time[30] = {0};
snprintf(query_time, sizeof(query_time), "%li", time(NULL) - 2);
SprintfLiteral(query_time, "%li", time(NULL) - 2);
asl_set_query(query, ASL_KEY_TIME, query_time,
ASL_QUERY_OP_NUMERIC | ASL_QUERY_OP_GREATER_EQUAL);
@ -74,7 +75,7 @@ nsSandboxViolationSink::ViolationHandler()
// be better to make the chrome process log all the other processes'
// violations.
char query_pid[20] = {0};
snprintf(query_pid, sizeof(query_pid), "%u", getpid());
SprintfLiteral(query_pid, "%u", getpid());
asl_set_query(query, ASL_KEY_REF_PID, query_pid, ASL_QUERY_OP_EQUAL);
}

6
xpcom/base/nsSystemInfo.cpp
View File

@ -12,6 +12,7 @@
#include "prprf.h"
#include "mozilla/SSE.h"
#include "mozilla/arm.h"
#include "mozilla/Sprintf.h"
#ifdef XP_WIN
#include <time.h>
@ -703,9 +704,8 @@ nsSystemInfo::Init()
#endif
if (gtkver_len <= 0) {
gtkver_len = snprintf(gtkver, sizeof(gtkver), "GTK %u.%u.%u",
gtk_major_version, gtk_minor_version,
gtk_micro_version);
gtkver_len = SprintfLiteral(gtkver, "GTK %u.%u.%u", gtk_major_version,
gtk_minor_version, gtk_micro_version);
}
nsAutoCString secondaryLibrary;

10
xpcom/glue/nsStringAPI.cpp
View File

@ -11,6 +11,8 @@
#include "nsXPCOMStrings.h"
#include "nsDebug.h"
#include "mozilla/Sprintf.h"
#include <stdio.h>
// nsAString
@ -521,9 +523,7 @@ nsAString::AppendInt(int aInt, int32_t aRadix)
}
char buf[20];
int len = snprintf(buf, sizeof(buf), fmt, aInt);
buf[sizeof(buf) - 1] = '\0';
int len = SprintfLiteral(buf, fmt, aInt);
Append(NS_ConvertASCIItoUTF16(buf, len));
}
@ -1001,9 +1001,7 @@ nsACString::AppendInt(int aInt, int32_t aRadix)
}
char buf[20];
int len = snprintf(buf, sizeof(buf), fmt, aInt);
buf[sizeof(buf) - 1] = '\0';
int len = SprintfLiteral(buf, fmt, aInt);
Append(buf, len);
}

Some files were not shown because too many files have changed in this diff Show More