mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
cbff465051
- Bug 1167420 - Handle fallible AppendElement call in netwerk/base/Dashboard.cpp. r=valentin (a485b8990) - Bug 968520 - Add mozilla::fallible to FallibleTArray::AppendElement calls. r=froydnj (12a529a0e) - Bug 1172584 - Avoid coping FallibleTArray in SendRequestRunnable constructor. r=dragana (c3a4a4253) - Bug 948466: Rename gfxPangoFonts to gfxFontconfigFonts. r=nical (43eed1f5f) - Bug 968520 - Add mozilla::fallible to more FallibleTArray calls. r=froydnj (339968a1d) - Bug 1166544 - Assume successful InsertElementAt calls in DOMSVG*List::MaybeInsertNullInAnimValListAt. r=dholbert (cf687dad7) - Bug 968520 - Add mozilla::fallible to FallibleTArray::InsertElementAt calls. r=froydnj (cc5c68ff2) - Bug 968520 - Add mozilla::fallible to more FallibleTArray::InsertElementsAt calls. r=froydnj (66df1d034) - Bug 1165735 - Make ThreadSharedFloatArrayBufferList::mContents infallible. r=roc (eda2839db) - Bug 1166544 - Use ReplaceElementAt instead of Clear and InsertElementAt in SVGMotionSMILType::Add. r=dholbert (474887a8c) - Bug 1167418 - Check AppendElement call in MediaQueryList. r=heycam (b6ed6d153) - Bug 1167418 - Use nsTArray instead of FallibleTArray in MediaQueryList. r=heycam (c9e3816d0) - Bug 1167418 - Follow-up: Fix bustage (5015e91ce) - Bug 1174220 - Part 1: Remove capacity constructor of MediaLargeByteBuffer. r=jya (66819d3e4) - Bug 1179282 - Use nsTArray::Assign instead of the assignment operator in dom/svg/. r=dholbert (cb3d43c19) - Bug 968520 - Add nsTArray::Assign. r=froydnj (e5eccf354) - Bug 1182277, don't leak when using nsAutoTArray inside nsTArray, r=nfroyd (bba32394c) - Bug 1143575. Avoid including Android's GraphicBuffer.h from LayersTypes.h. r=nical (99e4e2816) - Bug 1143575. Avoid use of COMPARE macro which can clash with Android headers. r=bent (99cfc74c4) - Bug 1143575. Add RefBase #include to stagefright stubs. r=cpearce (f9e327600) - Bug 1143575. test_HaveMetadataUnbufferedSeek should not wait for canplay since preload='metadata' elements may not fire canplay. r=cpearce (f1b0eee27) - Bug 1143575. Make GL context current before cleaning up programs. r=nical (d7b05b2bd) - partial Bug 1143575. Android's screenshotting code should invalidate the LayrManagerComposite to ensure composition will actually happen. r=nical (58fb296ab) - Bug 1143575. Remove unused Image::IsSentToCompositor tracking. r=nical (808d0b3f0) - Bug 1143575. Remove unused CompositionNotifySink. r=nical (98a332305) - Bug 1143575. Remove unused VideoFrameContainer::Reset. r=nical (e292bc722) - Bug 1143575. Rename mAsyncTransactionTrackeres to mAsyncTransactionTrackers. r=nical (df71ebf4f) - Bug 1143575. Remove unused ImageContainer::ResetPaintCount. r=nical (a92c5bf6e) - Bug 1143575. Remove unused VideoFrameContainer::ClearCurrentFrame aResetSize parameter. r=nical (5d3c9b83a) - Bug 1143575. Remove unused ReturnReleaseFence. r=nical (9d6ea92b5) - Bug 1143575. LayerManagerComposite can't get END_NO_COMPOSITE. r=mattwoodrow (0c5c364b5) - Bug 1143575. Remove unused AttachAsyncCompositable overload. r=nical (5fd3d4f6d) - Bug 1143575. Rename ImageBridgeChild's AutoRemoteTextures to AutoRemoveTexturesFromImageBridge to avoid clashes with later work. r=nical (34d67fcc0) - Bug 1143575. Fix some code formatting. r=nical (1d7f30f60) - Bug 1143575. Move mLayer from ImageClientBridge up into its superclass ImageClient. r=nical (40c902a36) - Bug 1127336 - Label HW-decoded frames with correct origin. - r=vlad (fd1580bcd) - Bug 1167504 - Part 1: Remove BindableName - Framebuffer. r=jgilbert (b3133eee6) - Bug 1167504 - Part 2: Remove BindableName - Renderbuffer. r=jgilbert (155a7e796) - Bug 1167504 - Part 3: Remove BindableName - Sampler. r=jgilbert (8c5c68960) - Bug 1167504 - Part 4: Remove BindableName - Texture. r=jgilbert (28077db04) - Bug 1167504 - Part 5: Remove BindableName - Transform Feedback. r=jgilbert (4fd839598) - Bug 1170454: Fix up instance type for VAOs. r=smaug,r=jgilbert (cc62d993a) - Bug 1167504 - Part 6: Remove BindableName - Vertex Array. r=jgilbert (1d54d5bc1) - Bug 1048724 - Implement GetBufferSubData. r=jgilbert, r=smaug (06570aa84) - Bug 1167504 - Part 7: Remove BindableName - Buffer. r=jgilbert (b2ddf3fc6)
435 lines
13 KiB
C++
435 lines
13 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "nsCOMPtr.h"
|
|
#include "nsIDocument.h"
|
|
#include "nsIScriptTimeoutHandler.h"
|
|
#include "nsIXPConnect.h"
|
|
#include "nsJSUtils.h"
|
|
#include "nsContentUtils.h"
|
|
#include "nsError.h"
|
|
#include "nsGlobalWindow.h"
|
|
#include "nsIContentSecurityPolicy.h"
|
|
#include "mozilla/Attributes.h"
|
|
#include "mozilla/Likely.h"
|
|
#include <algorithm>
|
|
#include "mozilla/dom/FunctionBinding.h"
|
|
#include "nsAXPCNativeCallContext.h"
|
|
|
|
static const char kSetIntervalStr[] = "setInterval";
|
|
static const char kSetTimeoutStr[] = "setTimeout";
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::dom;
|
|
|
|
// Our JS nsIScriptTimeoutHandler implementation.
|
|
class nsJSScriptTimeoutHandler final : public nsIScriptTimeoutHandler
|
|
{
|
|
public:
|
|
// nsISupports
|
|
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
|
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(nsJSScriptTimeoutHandler)
|
|
|
|
nsJSScriptTimeoutHandler();
|
|
// This will call SwapElements on aArguments with an empty array.
|
|
nsJSScriptTimeoutHandler(nsGlobalWindow *aWindow, Function& aFunction,
|
|
FallibleTArray<JS::Heap<JS::Value> >& aArguments,
|
|
ErrorResult& aError);
|
|
nsJSScriptTimeoutHandler(JSContext* aCx, nsGlobalWindow *aWindow,
|
|
const nsAString& aExpression, bool* aAllowEval,
|
|
ErrorResult& aError);
|
|
|
|
virtual const char16_t* GetHandlerText() override;
|
|
virtual Function* GetCallback() override
|
|
{
|
|
return mFunction;
|
|
}
|
|
virtual void GetLocation(const char** aFileName, uint32_t* aLineNo) override
|
|
{
|
|
*aFileName = mFileName.get();
|
|
*aLineNo = mLineNo;
|
|
}
|
|
|
|
virtual const nsTArray<JS::Value>& GetArgs() override
|
|
{
|
|
return mArgs;
|
|
}
|
|
|
|
nsresult Init(nsGlobalWindow *aWindow, bool *aIsInterval,
|
|
int32_t *aInterval, bool* aAllowEval);
|
|
|
|
void ReleaseJSObjects();
|
|
|
|
private:
|
|
~nsJSScriptTimeoutHandler();
|
|
|
|
// filename, line number and JS language version string of the
|
|
// caller of setTimeout()
|
|
nsCString mFileName;
|
|
uint32_t mLineNo;
|
|
nsTArray<JS::Heap<JS::Value> > mArgs;
|
|
|
|
// The expression to evaluate or function to call. If mFunction is non-null
|
|
// it should be used, else use mExpr.
|
|
nsString mExpr;
|
|
nsRefPtr<Function> mFunction;
|
|
};
|
|
|
|
|
|
// nsJSScriptTimeoutHandler
|
|
// QueryInterface implementation for nsJSScriptTimeoutHandler
|
|
NS_IMPL_CYCLE_COLLECTION_CLASS(nsJSScriptTimeoutHandler)
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsJSScriptTimeoutHandler)
|
|
tmp->ReleaseJSObjects();
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsJSScriptTimeoutHandler)
|
|
if (MOZ_UNLIKELY(cb.WantDebugInfo())) {
|
|
nsAutoCString name("nsJSScriptTimeoutHandler");
|
|
if (tmp->mFunction) {
|
|
JSFunction* fun =
|
|
JS_GetObjectFunction(js::UncheckedUnwrap(tmp->mFunction->Callable()));
|
|
if (fun && JS_GetFunctionId(fun)) {
|
|
JSFlatString *funId = JS_ASSERT_STRING_IS_FLAT(JS_GetFunctionId(fun));
|
|
size_t size = 1 + JS_PutEscapedFlatString(nullptr, 0, funId, 0);
|
|
char *funIdName = new char[size];
|
|
if (funIdName) {
|
|
JS_PutEscapedFlatString(funIdName, size, funId, 0);
|
|
name.AppendLiteral(" [");
|
|
name.Append(funIdName);
|
|
delete[] funIdName;
|
|
name.Append(']');
|
|
}
|
|
}
|
|
} else {
|
|
name.AppendLiteral(" [");
|
|
name.Append(tmp->mFileName);
|
|
name.Append(':');
|
|
name.AppendInt(tmp->mLineNo);
|
|
name.Append(']');
|
|
}
|
|
cb.DescribeRefCountedNode(tmp->mRefCnt.get(), name.get());
|
|
}
|
|
else {
|
|
NS_IMPL_CYCLE_COLLECTION_DESCRIBE(nsJSScriptTimeoutHandler,
|
|
tmp->mRefCnt.get())
|
|
}
|
|
|
|
if (tmp->mFunction) {
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFunction)
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
|
|
}
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(nsJSScriptTimeoutHandler)
|
|
for (uint32_t i = 0; i < tmp->mArgs.Length(); ++i) {
|
|
NS_IMPL_CYCLE_COLLECTION_TRACE_JSVAL_MEMBER_CALLBACK(mArgs[i])
|
|
}
|
|
NS_IMPL_CYCLE_COLLECTION_TRACE_END
|
|
|
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsJSScriptTimeoutHandler)
|
|
NS_INTERFACE_MAP_ENTRY(nsIScriptTimeoutHandler)
|
|
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
|
NS_INTERFACE_MAP_END
|
|
|
|
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsJSScriptTimeoutHandler)
|
|
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsJSScriptTimeoutHandler)
|
|
|
|
static bool
|
|
CheckCSPForEval(JSContext* aCx, nsGlobalWindow* aWindow, ErrorResult& aError)
|
|
{
|
|
// if CSP is enabled, and setTimeout/setInterval was called with a string,
|
|
// disable the registration and log an error
|
|
nsCOMPtr<nsIDocument> doc = aWindow->GetExtantDoc();
|
|
if (!doc) {
|
|
// if there's no document, we don't have to do anything.
|
|
return true;
|
|
}
|
|
|
|
nsCOMPtr<nsIContentSecurityPolicy> csp;
|
|
aError = doc->NodePrincipal()->GetCsp(getter_AddRefs(csp));
|
|
if (aError.Failed()) {
|
|
return false;
|
|
}
|
|
|
|
if (!csp) {
|
|
return true;
|
|
}
|
|
|
|
bool allowsEval = true;
|
|
bool reportViolation = false;
|
|
aError = csp->GetAllowsEval(&reportViolation, &allowsEval);
|
|
if (aError.Failed()) {
|
|
return false;
|
|
}
|
|
|
|
if (reportViolation) {
|
|
// TODO : need actual script sample in violation report.
|
|
NS_NAMED_LITERAL_STRING(scriptSample,
|
|
"call to eval() or related function blocked by CSP");
|
|
|
|
// Get the calling location.
|
|
uint32_t lineNum = 0;
|
|
nsAutoString fileNameString;
|
|
if (!nsJSUtils::GetCallingLocation(aCx, fileNameString, &lineNum)) {
|
|
fileNameString.AssignLiteral("unknown");
|
|
}
|
|
|
|
csp->LogViolationDetails(nsIContentSecurityPolicy::VIOLATION_TYPE_EVAL,
|
|
fileNameString, scriptSample, lineNum,
|
|
EmptyString(), EmptyString());
|
|
}
|
|
|
|
return allowsEval;
|
|
}
|
|
|
|
nsJSScriptTimeoutHandler::nsJSScriptTimeoutHandler() :
|
|
mLineNo(0)
|
|
{
|
|
}
|
|
|
|
nsJSScriptTimeoutHandler::nsJSScriptTimeoutHandler(nsGlobalWindow *aWindow,
|
|
Function& aFunction,
|
|
FallibleTArray<JS::Heap<JS::Value> >& aArguments,
|
|
ErrorResult& aError) :
|
|
mLineNo(0),
|
|
mFunction(&aFunction)
|
|
{
|
|
if (!aWindow->GetContextInternal() || !aWindow->FastGetGlobalJSObject()) {
|
|
// This window was already closed, or never properly initialized,
|
|
// don't let a timer be scheduled on such a window.
|
|
aError.Throw(NS_ERROR_NOT_INITIALIZED);
|
|
return;
|
|
}
|
|
|
|
mozilla::HoldJSObjects(this);
|
|
mArgs.SwapElements(aArguments);
|
|
}
|
|
|
|
nsJSScriptTimeoutHandler::nsJSScriptTimeoutHandler(JSContext* aCx,
|
|
nsGlobalWindow *aWindow,
|
|
const nsAString& aExpression,
|
|
bool* aAllowEval,
|
|
ErrorResult& aError) :
|
|
mLineNo(0),
|
|
mExpr(aExpression)
|
|
{
|
|
if (!aWindow->GetContextInternal() || !aWindow->FastGetGlobalJSObject()) {
|
|
// This window was already closed, or never properly initialized,
|
|
// don't let a timer be scheduled on such a window.
|
|
aError.Throw(NS_ERROR_NOT_INITIALIZED);
|
|
return;
|
|
}
|
|
|
|
*aAllowEval = CheckCSPForEval(aCx, aWindow, aError);
|
|
if (aError.Failed() || !*aAllowEval) {
|
|
return;
|
|
}
|
|
|
|
// Get the calling location.
|
|
nsJSUtils::GetCallingLocation(aCx, mFileName, &mLineNo);
|
|
}
|
|
|
|
nsJSScriptTimeoutHandler::~nsJSScriptTimeoutHandler()
|
|
{
|
|
ReleaseJSObjects();
|
|
}
|
|
|
|
void
|
|
nsJSScriptTimeoutHandler::ReleaseJSObjects()
|
|
{
|
|
if (mFunction) {
|
|
mFunction = nullptr;
|
|
mArgs.Clear();
|
|
mozilla::DropJSObjects(this);
|
|
}
|
|
}
|
|
|
|
nsresult
|
|
nsJSScriptTimeoutHandler::Init(nsGlobalWindow *aWindow, bool *aIsInterval,
|
|
int32_t *aInterval, bool *aAllowEval)
|
|
{
|
|
if (!aWindow->GetContextInternal() || !aWindow->FastGetGlobalJSObject()) {
|
|
// This window was already closed, or never properly initialized,
|
|
// don't let a timer be scheduled on such a window.
|
|
|
|
return NS_ERROR_NOT_INITIALIZED;
|
|
}
|
|
|
|
nsAXPCNativeCallContext *ncc = nullptr;
|
|
nsresult rv = nsContentUtils::XPConnect()->
|
|
GetCurrentNativeCallContext(&ncc);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
if (!ncc)
|
|
return NS_ERROR_NOT_AVAILABLE;
|
|
|
|
JSContext *cx = nullptr;
|
|
|
|
rv = ncc->GetJSContext(&cx);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
uint32_t argc;
|
|
JS::Value *argv = nullptr;
|
|
|
|
ncc->GetArgc(&argc);
|
|
ncc->GetArgvPtr(&argv);
|
|
|
|
JS::Rooted<JSFlatString*> expr(cx);
|
|
JS::Rooted<JSObject*> funobj(cx);
|
|
|
|
if (argc < 1) {
|
|
::JS_ReportError(cx, "Function %s requires at least 2 parameter",
|
|
*aIsInterval ? kSetIntervalStr : kSetTimeoutStr);
|
|
return NS_ERROR_DOM_TYPE_ERR;
|
|
}
|
|
|
|
int32_t interval = 0;
|
|
if (argc > 1) {
|
|
JS::Rooted<JS::Value> arg(cx, argv[1]);
|
|
|
|
if (!JS::ToInt32(cx, arg, &interval)) {
|
|
::JS_ReportError(cx,
|
|
"Second argument to %s must be a millisecond interval",
|
|
aIsInterval ? kSetIntervalStr : kSetTimeoutStr);
|
|
return NS_ERROR_DOM_TYPE_ERR;
|
|
}
|
|
}
|
|
|
|
if (argc == 1) {
|
|
// If no interval was specified, treat this like a timeout, to avoid
|
|
// setting an interval of 0 milliseconds.
|
|
*aIsInterval = false;
|
|
}
|
|
|
|
JS::Rooted<JS::Value> arg(cx, argv[0]);
|
|
switch (::JS_TypeOfValue(cx, arg)) {
|
|
case JSTYPE_FUNCTION:
|
|
funobj = &arg.toObject();
|
|
break;
|
|
|
|
case JSTYPE_STRING:
|
|
case JSTYPE_OBJECT:
|
|
{
|
|
JSString *str = JS::ToString(cx, arg);
|
|
if (!str)
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
expr = ::JS_FlattenString(cx, str);
|
|
if (!expr)
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
argv[0] = JS::StringValue(str);
|
|
}
|
|
break;
|
|
|
|
default:
|
|
::JS_ReportError(cx, "useless %s call (missing quotes around argument?)",
|
|
*aIsInterval ? kSetIntervalStr : kSetTimeoutStr);
|
|
|
|
// Return an error that nsGlobalWindow can recognize and turn into NS_OK.
|
|
return NS_ERROR_DOM_TYPE_ERR;
|
|
}
|
|
|
|
if (expr) {
|
|
// if CSP is enabled, and setTimeout/setInterval was called with a string,
|
|
// disable the registration and log an error
|
|
ErrorResult error;
|
|
*aAllowEval = CheckCSPForEval(cx, aWindow, error);
|
|
if (error.Failed() || !*aAllowEval) {
|
|
return error.StealNSResult();
|
|
}
|
|
|
|
MOZ_ASSERT(mExpr.IsEmpty());
|
|
AssignJSFlatString(mExpr, expr);
|
|
|
|
// Get the calling location.
|
|
nsJSUtils::GetCallingLocation(cx, mFileName, &mLineNo);
|
|
} else if (funobj) {
|
|
*aAllowEval = true;
|
|
|
|
mozilla::HoldJSObjects(this);
|
|
|
|
mFunction = new Function(funobj, GetIncumbentGlobal());
|
|
|
|
// Create our arg array. argc is the number of arguments passed
|
|
// to setTimeout or setInterval; the first two are our callback
|
|
// and the delay, so only arguments after that need to go in our
|
|
// array.
|
|
// std::max(argc - 2, 0) wouldn't work right because argc is unsigned.
|
|
uint32_t argCount = std::max(argc, 2u) - 2;
|
|
|
|
FallibleTArray<JS::Heap<JS::Value> > args;
|
|
if (!args.SetCapacity(argCount, fallible)) {
|
|
// No need to drop here, since we already have a non-null mFunction
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
for (uint32_t idx = 0; idx < argCount; ++idx) {
|
|
*args.AppendElement(fallible) = argv[idx + 2];
|
|
}
|
|
args.SwapElements(mArgs);
|
|
} else {
|
|
NS_WARNING("No func and no expr - why are we here?");
|
|
}
|
|
*aInterval = interval;
|
|
return NS_OK;
|
|
}
|
|
|
|
const char16_t *
|
|
nsJSScriptTimeoutHandler::GetHandlerText()
|
|
{
|
|
NS_ASSERTION(!mFunction, "No expression, so no handler text!");
|
|
return mExpr.get();
|
|
}
|
|
|
|
nsresult NS_CreateJSTimeoutHandler(nsGlobalWindow *aWindow,
|
|
bool *aIsInterval,
|
|
int32_t *aInterval,
|
|
nsIScriptTimeoutHandler **aRet)
|
|
{
|
|
*aRet = nullptr;
|
|
nsRefPtr<nsJSScriptTimeoutHandler> handler = new nsJSScriptTimeoutHandler();
|
|
bool allowEval;
|
|
nsresult rv = handler->Init(aWindow, aIsInterval, aInterval, &allowEval);
|
|
if (NS_FAILED(rv) || !allowEval) {
|
|
return rv;
|
|
}
|
|
|
|
handler.forget(aRet);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
already_AddRefed<nsIScriptTimeoutHandler>
|
|
NS_CreateJSTimeoutHandler(nsGlobalWindow *aWindow, Function& aFunction,
|
|
const Sequence<JS::Value>& aArguments,
|
|
ErrorResult& aError)
|
|
{
|
|
FallibleTArray<JS::Heap<JS::Value> > args;
|
|
if (!args.AppendElements(aArguments, fallible)) {
|
|
aError.Throw(NS_ERROR_OUT_OF_MEMORY);
|
|
return nullptr;
|
|
}
|
|
|
|
nsRefPtr<nsJSScriptTimeoutHandler> handler =
|
|
new nsJSScriptTimeoutHandler(aWindow, aFunction, args, aError);
|
|
return aError.Failed() ? nullptr : handler.forget();
|
|
}
|
|
|
|
already_AddRefed<nsIScriptTimeoutHandler>
|
|
NS_CreateJSTimeoutHandler(JSContext* aCx, nsGlobalWindow *aWindow,
|
|
const nsAString& aExpression, ErrorResult& aError)
|
|
{
|
|
bool allowEval = false;
|
|
nsRefPtr<nsJSScriptTimeoutHandler> handler =
|
|
new nsJSScriptTimeoutHandler(aCx, aWindow, aExpression, &allowEval, aError);
|
|
if (aError.Failed() || !allowEval) {
|
|
return nullptr;
|
|
}
|
|
|
|
return handler.forget();
|
|
}
|