wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge mozilla-central and inbound

Browse Source
This commit is contained in:
Ed Morley 2014-01-06 15:20:18 +00:00
commit 2d646477b9
41 changed files with 170 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/base/src/nsScriptLoader.cpp
View File

@ -724,7 +724,7 @@ class NotifyOffThreadScriptLoadCompletedRunnable : public nsRunnable
public:
NotifyOffThreadScriptLoadCompletedRunnable(nsScriptLoadRequest* aRequest,
nsScriptLoader* aLoader)
: mRequest(aRequest), mLoader(aLoader), mToken(NULL)
: mRequest(aRequest), mLoader(aLoader), mToken(nullptr)
{}
void SetToken(void* aToken) {

2
content/media/fmp4/wmf/MFTDecoder.cpp
View File

@ -36,7 +36,7 @@ MFTDecoder::Create(const GUID& aMFTClsID)
// Create the IMFTransform to do the decoding.
HRESULT hr;
hr = CoCreateInstance(aMFTClsID,
NULL,
nullptr,
CLSCTX_INPROC_SERVER,
IID_IMFTransform,
reinterpret_cast<void**>(static_cast<IMFTransform**>(byRef(mDecoder))));

2
content/media/fmp4/wmf/WMFVideoDecoder.cpp
View File

@ -245,7 +245,7 @@ WMFVideoDecoder::CreateBasicVideoFrame(IMFSample* aSample,
hr = twoDBuffer->Lock2D(&data, &stride);
NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
} else {
hr = buffer->Lock(&data, NULL, NULL);
hr = buffer->Lock(&data, nullptr, nullptr);
NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
stride = mVideoStride;
}

2
dom/asmjscache/AsmJSCache.cpp
View File

@ -461,7 +461,7 @@ MainProcessRunnable::OpenFileOnIOThread()
mGroup, mOrigin, path);
NS_ENSURE_STATE(mQuotaObject);
int openFlags;
int32_t openFlags;
if (mOpenMode == eOpenForRead) {
rv = path->GetFileSize(&mFileSize);
if (NS_FAILED(rv)) {

2
dom/bluetooth/bluedroid/BluetoothSocket.cpp
View File

@ -426,7 +426,7 @@ DroidSocketImpl::ReadMsg(int aFd, void *aBuffer, size_t aLength)
// Extract client fd from message header
for (struct cmsghdr *cmsgptr = CMSG_FIRSTHDR(&msg);
cmsgptr != NULL; cmsgptr = CMSG_NXTHDR(&msg, cmsgptr)) {
cmsgptr != nullptr; cmsgptr = CMSG_NXTHDR(&msg, cmsgptr)) {
if (cmsgptr->cmsg_level != SOL_SOCKET) {
continue;
}

12
gfx/2d/BaseRect.h
View File

@ -441,18 +441,18 @@ struct BaseRect {
}
/**
* Clamp aRect to this rectangle. This returns aRect after it is forced
* inside the bounds of this rectangle. It will attempt to retain the size
* but will shrink the dimensions that don't fit.
* Clamp this rectangle to be inside aRect. The function returns a copy of
* this rect after it is forced inside the bounds of aRect. It will attempt to
* retain the size but will shrink the dimensions that don't fit.
*/
Sub ClampRect(const Sub& aRect) const
Sub ForceInside(const Sub& aRect) const
{
Sub rect(std::max(aRect.x, x),
std::max(aRect.y, y),
std::min(aRect.width, width),
std::min(aRect.height, height));
rect.x = std::min(rect.XMost(), XMost()) - rect.width;
rect.y = std::min(rect.YMost(), YMost()) - rect.height;
rect.x = std::min(rect.XMost(), aRect.XMost()) - rect.width;
rect.y = std::min(rect.YMost(), aRect.YMost()) - rect.height;
return rect;
}

4
gfx/2d/DrawTargetSkia.cpp
View File

@ -751,7 +751,9 @@ DrawTargetSkia::CopySurface(SourceSurface *aSurface,
bool
DrawTargetSkia::Init(const IntSize &aSize, SurfaceFormat aFormat)
{
SkAutoTUnref<SkDevice> device(new SkDevice(GfxFormatToSkiaConfig(aFormat), aSize.width, aSize.height));
SkAutoTUnref<SkDevice> device(new SkDevice(GfxFormatToSkiaConfig(aFormat),
aSize.width, aSize.height,
aFormat == FORMAT_B8G8R8X8));
SkBitmap bitmap = device->accessBitmap(true);
if (!bitmap.allocPixels()) {

2
gfx/layers/Effects.h
View File

@ -189,7 +189,7 @@ struct EffectSolidColor : public Effect
struct EffectChain
{
EffectChain() : mLayerRef(NULL) {}
EffectChain() : mLayerRef(nullptr) {}
explicit EffectChain(void* aLayerRef) : mLayerRef(aLayerRef) {}
RefPtr<Effect> mPrimaryEffect;

8
gfx/layers/composite/ImageHost.h
View File

@ -6,7 +6,7 @@
#ifndef MOZILLA_GFX_IMAGEHOST_H
#define MOZILLA_GFX_IMAGEHOST_H
#include <stdio.h> // for FILE, NULL
#include <stdio.h> // for FILE
#include "CompositableHost.h" // for CompositableHost
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE
#include "mozilla/RefPtr.h" // for RefPtr
@ -70,9 +70,9 @@ public:
virtual void PrintInfo(nsACString& aTo, const char* aPrefix);
#ifdef MOZ_DUMP_PAINTING
virtual void Dump(FILE* aFile=NULL,
const char* aPrefix="",
bool aDumpHtml=false) MOZ_OVERRIDE;
virtual void Dump(FILE* aFile = nullptr,
const char* aPrefix = "",
bool aDumpHtml = false) MOZ_OVERRIDE;
virtual TemporaryRef<gfx::DataSourceSurface> GetAsSurface() MOZ_OVERRIDE;
#endif

12
gfx/layers/d3d9/CompositorD3D9.cpp
View File

@ -98,7 +98,7 @@ CompositorD3D9::CreateRenderTarget(const gfx::IntRect &aRect,
HRESULT hr = device()->CreateTexture(aRect.width, aRect.height, 1,
D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8,
D3DPOOL_DEFAULT, byRef(texture),
NULL);
nullptr);
if (FAILED(hr)) {
ReportFailure(NS_LITERAL_CSTRING("CompositorD3D9::CreateRenderTarget: Failed to create texture"),
hr);
@ -124,7 +124,7 @@ CompositorD3D9::CreateRenderTargetFromSource(const gfx::IntRect &aRect,
HRESULT hr = device()->CreateTexture(aRect.width, aRect.height, 1,
D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8,
D3DPOOL_DEFAULT, byRef(texture),
NULL);
nullptr);
if (FAILED(hr)) {
ReportFailure(NS_LITERAL_CSTRING("CompositorD3D9::CreateRenderTargetFromSource: Failed to create texture"),
hr);
@ -409,7 +409,7 @@ CompositorD3D9::DrawQuad(const gfx::Rect &aRect,
// Restore defaults
d3d9Device->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_ONE);
d3d9Device->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
d3d9Device->SetTexture(1, NULL);
d3d9Device->SetTexture(1, nullptr);
}
return;
default:
@ -570,7 +570,7 @@ CompositorD3D9::BeginFrame(const nsIntRegion& aInvalidRegion,
EnsureSize();
device()->Clear(0, NULL, D3DCLEAR_TARGET, 0x00000000, 0, 0);
device()->Clear(0, nullptr, D3DCLEAR_TARGET, 0x00000000, 0, 0);
device()->BeginScene();
if (aClipRectOut) {
@ -687,12 +687,12 @@ CompositorD3D9::PaintToTarget()
device()->CreateOffscreenPlainSurface(desc.Width, desc.Height,
D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM,
getter_AddRefs(destSurf), NULL);
getter_AddRefs(destSurf), nullptr);
device()->GetRenderTargetData(backBuff, destSurf);
D3DLOCKED_RECT rect;
destSurf->LockRect(&rect, NULL, D3DLOCK_READONLY);
destSurf->LockRect(&rect, nullptr, D3DLOCK_READONLY);
RefPtr<DataSourceSurface> sourceSurface =
Factory::CreateWrappingDataSourceSurface((uint8_t*)rect.pBits,
rect.Pitch,

2
gfx/layers/d3d9/CompositorD3D9.h
View File

@ -159,7 +159,7 @@ private:
nsIWidget *mWidget;
/*
* Context target, NULL when drawing directly to our swap chain.
* Context target, nullptr when drawing directly to our swap chain.
*/
RefPtr<gfx::DrawTarget> mTarget;

2
gfx/layers/d3d9/DeviceManagerD3D9.cpp
View File

@ -155,7 +155,7 @@ SwapChainD3D9::Present(const nsIntRect &aRect)
void
SwapChainD3D9::Present()
{
mSwapChain->Present(NULL, NULL, 0, 0, 0);
mSwapChain->Present(nullptr, nullptr, 0, 0, 0);
}
void

5
gfx/layers/d3d9/TextureD3D9.cpp
View File

@ -184,7 +184,7 @@ TextureSourceD3D9::InitTextures(DeviceManagerD3D9* aDeviceManager,
}
tmpTexture->GetSurfaceLevel(0, byRef(aSurface));
aSurface->LockRect(&aLockedRect, NULL, 0);
aSurface->LockRect(&aLockedRect, nullptr, 0);
if (!aLockedRect.pBits) {
NS_WARNING("Could not lock surface");
return nullptr;
@ -208,7 +208,8 @@ FinishTextures(DeviceManagerD3D9* aDeviceManager,
aSurface->UnlockRect();
nsRefPtr<IDirect3DSurface9> dstSurface;
aTexture->GetSurfaceLevel(0, getter_AddRefs(dstSurface));
aDeviceManager->device()->UpdateSurface(aSurface, NULL, dstSurface, NULL);
aDeviceManager->device()->UpdateSurface(aSurface, nullptr, dstSurface,
nullptr);
}
TemporaryRef<IDirect3DTexture9>

3
gfx/layers/ipc/AsyncPanZoomController.cpp
View File

@ -1257,8 +1257,7 @@ const CSSRect AsyncPanZoomController::CalculatePendingDisplayPort(
scrollOffset.y = scrollableRect.y;
}
CSSRect shiftedDisplayPort = displayPort + scrollOffset;
return scrollableRect.ClampRect(shiftedDisplayPort) - scrollOffset;
return displayPort.ForceInside(scrollableRect - scrollOffset);
}
void AsyncPanZoomController::ScheduleComposite() {

2
gfx/src/nsRegion.h
View File

@ -266,7 +266,7 @@ private:
// pixman needs to distinguish between an empty region and a region
// with one rect so that it can return a different number of rectangles.
// Empty rect: data = empty_box
// 1 rect: data = NULL
// 1 rect: data = null
// >1 rect: data = rects
if (aRect.IsEmpty()) {
pixman_region32_clear(&mImpl);

2
gfx/thebes/gfxASurface.cpp
View File

@ -876,7 +876,7 @@ gfxASurface::WriteAsPNG_internal(FILE* aFile, bool aBinary)
return;
}
// base 64, result will be NULL terminated
// base 64, result will be null-terminated
nsCString encodedImg;
rv = Base64Encode(Substring(imgData, imgSize), encodedImg);
moz_free(imgData);

8
js/src/builtin/SIMD.cpp
View File

@ -78,7 +78,7 @@ struct Int32x4 {
static const char *laneNames[] = {"lane 0", "lane 1", "lane 2", "lane3"}; \
CallArgs args = CallArgsFromVp(argc, vp); \
if(!args.thisv().isObject() || !IsTypedDatum(args.thisv().toObject())) { \
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_INCOMPATIBLE_PROTO, \
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO, \
X4Type::class_.name, laneNames[lane], \
InformalValueTypeName(args.thisv())); \
return false; \
@ -86,7 +86,7 @@ struct Int32x4 {
TypedDatum &datum = AsTypedDatum(args.thisv().toObject()); \
TypeRepresentation *typeRepr = datum.datumTypeRepresentation(); \
if (typeRepr->kind() != TypeRepresentation::X4 || typeRepr->asX4()->type() != Type32x4::type) { \
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_INCOMPATIBLE_PROTO, \
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO, \
X4Type::class_.name, laneNames[lane], \
InformalValueTypeName(args.thisv())); \
return false; \
@ -109,7 +109,7 @@ struct Int32x4 {
bool Type32x4##SignMask(JSContext *cx, unsigned argc, Value *vp) { \
CallArgs args = CallArgsFromVp(argc, vp); \
if(!args.thisv().isObject() || !IsTypedDatum(args.thisv().toObject())) { \
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_INCOMPATIBLE_PROTO, \
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO, \
X4Type::class_.name, "signMask", \
InformalValueTypeName(args.thisv())); \
return false; \
@ -117,7 +117,7 @@ struct Int32x4 {
TypedDatum &datum = AsTypedDatum(args.thisv().toObject()); \
TypeRepresentation *typeRepr = datum.datumTypeRepresentation(); \
if (typeRepr->kind() != TypeRepresentation::X4 || typeRepr->asX4()->type() != Type32x4::type) { \
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_INCOMPATIBLE_PROTO, \
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_INCOMPATIBLE_PROTO, \
X4Type::class_.name, "signMask", \
InformalValueTypeName(args.thisv())); \
return false; \

28
js/src/builtin/TestingFunctions.cpp
View File

@ -1127,6 +1127,30 @@ SetJitCompilerOption(JSContext *cx, unsigned argc, jsval *vp)
return true;
}
static bool
GetJitCompilerOptions(JSContext *cx, unsigned argc, jsval *vp)
{
RootedObject info(cx, JS_NewObject(cx, nullptr, nullptr, nullptr));
if (!info)
return false;
RootedValue value(cx);
#define JIT_COMPILER_MATCH(key, string) \
opt = JSJITCOMPILER_ ## key; \
value.setInt32(JS_GetGlobalJitCompilerOption(cx, opt)); \
if (!JS_SetProperty(cx, info, string, value)) \
return false;
JSJitCompilerOption opt = JSJITCOMPILER_NOT_AN_OPTION;
JIT_COMPILER_OPTIONS(JIT_COMPILER_MATCH);
#undef JIT_COMPILER_MATCH
*vp = ObjectValue(*info);
return true;
}
static bool
SetIonCheckGraphCoherency(JSContext *cx, unsigned argc, jsval *vp)
{
@ -1546,6 +1570,10 @@ static const JSFunctionSpecWithHelp TestingFunctions[] = {
" Returns whether asm.js compilation is currently available or whether it is disabled\n"
" (e.g., by the debugger)."),
JS_FN_HELP("getJitCompilerOptions", GetJitCompilerOptions, 0, 0,
"getCompilerOptions()",
"Return an object describing some of the JIT compiler options.\n"),
JS_FN_HELP("isAsmJSModule", IsAsmJSModule, 1, 0,
"isAsmJSModule(fn)",
" Returns whether the given value is a function containing \"use asm\" that has been\n"

2
js/src/builtin/TypeRepresentation.cpp
View File

@ -781,7 +781,7 @@ SizedArrayTypeRepresentation::appendStringSizedArray(JSContext *cx, StringBuffer
contents.append(".array(");
SizedArrayTypeRepresentation *arrayType = this;
while (arrayType != NULL) {
while (arrayType != nullptr) {
if (!NumberValueToStringBuffer(cx, NumberValue(length()), contents))
return false;

22
js/src/devtools/vprof/vprof.cpp
View File

@ -53,7 +53,7 @@
#define UNLOCK(lock) }
#endif
static entry* entries = NULL;
static entry* entries = nullptr;
static bool notInitialized = true;
static long glock = LOCK_IS_FREE;
@ -82,7 +82,7 @@ static inline entry* reverse (entry* s)
{
entry_t e, n, p;
p = NULL;
p = nullptr;
for (e = s; e; e = n) {
n = e->next;
e->next = p;
@ -158,7 +158,7 @@ static inline entry_t findEntry (char* file, int line)
return e;
}
}
return NULL;
return nullptr;
}
// Initialize the location pointed to by 'id' to a new value profile entry
@ -174,14 +174,14 @@ int initValueProfile(void** id, char* file, int line, ...)
notInitialized = false;
}
if (e == NULL) {
if (e == nullptr) {
e = findEntry (file, line);
if (e) {
*id = e;
}
}
if (e == NULL) {
if (e == nullptr) {
va_list va;
e = (entry_t) malloc (sizeof(entry));
e->lock = LOCK_IS_FREE;
@ -196,8 +196,8 @@ int initValueProfile(void** id, char* file, int line, ...)
va_start (va, line);
e->func = (void (__cdecl*)(void*)) va_arg (va, void*);
va_end (va);
e->h = NULL;
e->genptr = NULL;
e->h = nullptr;
e->genptr = nullptr;
VMPI_memset (&e->ivar, 0, sizeof(e->ivar));
VMPI_memset (&e->i64var, 0, sizeof(e->i64var));
VMPI_memset (&e->dvar, 0, sizeof(e->dvar));
@ -247,14 +247,14 @@ int initHistProfile(void** id, char* file, int line, int nbins, ...)
notInitialized = false;
}
if (e == NULL) {
if (e == nullptr) {
e = findEntry (file, line);
if (e) {
*id = e;
}
}
if (e == NULL) {
if (e == nullptr) {
va_list va;
hist_t h;
int b, n, s;
@ -269,7 +269,7 @@ int initHistProfile(void** id, char* file, int line, int nbins, ...)
e->count = 0;
e->min = 0;
e->max = 0;
e->func = NULL;
e->func = nullptr;
e->h = h = (hist_t) malloc (sizeof(hist));
n = 1+MAX(nbins,0);
h->nbins = n-1;
@ -288,7 +288,7 @@ int initHistProfile(void** id, char* file, int line, int nbins, ...)
lb[b] = MAXINT64;
va_end (va);
e->genptr = NULL;
e->genptr = nullptr;
VMPI_memset (&e->ivar, 0, sizeof(e->ivar));
VMPI_memset (&e->i64var, 0, sizeof(e->i64var));
VMPI_memset (&e->dvar, 0, sizeof(e->dvar));

3
js/src/jit-test/tests/ion/bug909997.js
View File

@ -21,6 +21,9 @@ var func = [method_A, method_B, method_C, method_D]
for (var n = 0; n < 4; ++n) {
setJitCompilerOption("baseline.enable", n & 1);
setJitCompilerOption("ion.enable", n & 2 ? 1: 0);
var opt = getJitCompilerOptions();
assertEq(opt["baseline.enable"], n & 1);
assertEq(opt["ion.enable"], n & 2 ? 1 : 0);
for (var i = 0; i < 1001; ++i)
func[n]();
}

8
js/src/jit/AsmJS.cpp
View File

@ -2078,7 +2078,7 @@ class FunctionCompiler
MDefinition *constantFloat(float f)
{
if (!curBlock_)
return NULL;
return nullptr;
MConstant *constant = MConstant::NewAsmJS(alloc(), DoubleValue(double(f)), MIRType_Float32);
curBlock_->add(constant);
@ -3042,7 +3042,7 @@ static bool
CheckGlobalVariableInitFloat32(ModuleCompiler &m, PropertyName *varName, ParseNode *initNode,
bool isConst)
{
ParseNode *arg = NULL;
ParseNode *arg = nullptr;
if (!CheckFloat32Coercion(m, initNode, &arg, "call must be of the form fround(x)"))
return false;
@ -3305,7 +3305,7 @@ CheckVariable(FunctionCompiler &f, ParseNode *var)
return f.failName(var, "var '%s' needs explicit type declaration via an initial value", name);
if (initNode->isKind(PNK_CALL)) {
ParseNode *coercedVar = NULL;
ParseNode *coercedVar = nullptr;
if (!CheckFloat32Coercion(f.m(), initNode, &coercedVar, "caller in var initializer can only be fround"))
return false;
@ -3986,7 +3986,7 @@ static bool CheckCall(FunctionCompiler &f, ParseNode *call, RetType retType, MDe
static bool
CheckFRoundArg(FunctionCompiler &f, ParseNode *expr, MDefinition **def, Type *type, const char* error)
{
ParseNode *arg = NULL;
ParseNode *arg = nullptr;
if (!CheckFloat32Coercion(f.m(), expr, &arg, error))
return false;

22
js/src/jsapi.cpp
View File

@ -2430,7 +2430,7 @@ JS_SetPrototype(JSContext *cx, JS::Handle<JSObject*> obj, JS::Handle<JSObject*>
return false;
if (!succeeded) {
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_SETPROTOTYPEOF_FAIL);
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SETPROTOTYPEOF_FAIL);
return false;
}
@ -6040,6 +6040,26 @@ JS_SetGlobalJitCompilerOption(JSContext *cx, JSJitCompilerOption opt, uint32_t v
#endif
}
JS_PUBLIC_API(int)
JS_GetGlobalJitCompilerOption(JSContext *cx, JSJitCompilerOption opt)
{
#ifdef JS_ION
switch (opt) {
case JSJITCOMPILER_BASELINE_USECOUNT_TRIGGER:
return jit::js_JitOptions.baselineUsesBeforeCompile;
case JSJITCOMPILER_ION_USECOUNT_TRIGGER:
return jit::js_JitOptions.forcedDefaultIonUsesBeforeCompile;
case JSJITCOMPILER_ION_ENABLE:
return JS::ContextOptionsRef(cx).ion();
case JSJITCOMPILER_BASELINE_ENABLE:
return JS::ContextOptionsRef(cx).baseline();
default:
break;
}
#endif
return 0;
}
/************************************************************************/
#if !defined(STATIC_EXPORTABLE_JS_API) && !defined(STATIC_JS_API) && defined(XP_WIN)

2
js/src/jsapi.h
View File

@ -4557,6 +4557,8 @@ typedef enum JSJitCompilerOption {
extern JS_PUBLIC_API(void)
JS_SetGlobalJitCompilerOption(JSContext *cx, JSJitCompilerOption opt, uint32_t value);
extern JS_PUBLIC_API(int)
JS_GetGlobalJitCompilerOption(JSContext *cx, JSJitCompilerOption opt);
/*
* Convert a uint32_t index into a jsid.

2
js/src/jsproxy.cpp
View File

@ -354,7 +354,7 @@ BaseProxyHandler::setPrototypeOf(JSContext *cx, HandleObject, HandleObject, bool
// Disallow sets of protos on proxies with lazy protos, but no hook.
// This keeps us away from the footgun of having the first proto set opt
// you out of having dynamic protos altogether.
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_SETPROTOTYPEOF_FAIL);
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SETPROTOTYPEOF_FAIL);
return false;
}

2
js/src/jsscript.cpp
View File

@ -848,7 +848,7 @@ js::XDRScript(XDRState<mode> *xdr, HandleObject enclosingScope, HandleScript enc
/* see BytecodeEmitter::tellDebuggerAboutCompiledScript */
CallNewScriptHook(cx, script, fun);
if (!fun) {
RootedGlobalObject global(cx, script->compileAndGo() ? &script->global() : NULL);
RootedGlobalObject global(cx, script->compileAndGo() ? &script->global() : nullptr);
Debugger::onNewScript(cx, script, global);
}
}

2
js/src/jswrapper.cpp
View File

@ -665,7 +665,7 @@ bool
SecurityWrapper<Base>::setPrototypeOf(JSContext *cx, HandleObject wrapper,
HandleObject proto, bool *bp)
{
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_UNWRAP_DENIED);
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_UNWRAP_DENIED);
return false;
}

2
js/src/vm/GlobalObject.cpp
View File

@ -153,7 +153,7 @@ ProtoSetterImpl(JSContext *cx, CallArgs args)
return false;
if (!success) {
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_SETPROTOTYPEOF_FAIL);
JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_SETPROTOTYPEOF_FAIL);
return false;
}

2
layout/base/nsDisplayList.cpp
View File

@ -716,7 +716,7 @@ static void RecordFrameMetrics(nsIFrame* aForFrame,
ScreenIntRect screenBounds = ScreenIntRect::FromUnknownRect(mozilla::gfx::IntRect(
bounds.x, bounds.y, bounds.width, bounds.height));
AdjustForScrollBars(screenBounds, scrollableFrame);
metrics.mCompositionBounds = screenBounds.ClampRect(metrics.mCompositionBounds);
metrics.mCompositionBounds = metrics.mCompositionBounds.ForceInside(screenBounds);
useWidgetBounds = true;
}
}

4
netwerk/dns/nsHostResolver.cpp
View File

@ -1013,12 +1013,12 @@ public:
dnsUUID.Assign(Substring(nsDependentCString(uuid), 1, NSID_LENGTH - 3));
// Create events for A and SRV resolvers
events[0] = CreateEvent(NULL, TRUE, FALSE, TEXT("FinishedA"));
events[0] = CreateEvent(nullptr, TRUE, FALSE, TEXT("FinishedA"));
if (!events[0]) {
goto library_cleanup;
}
events[1] = CreateEvent(NULL, TRUE, FALSE, TEXT("FinishedSRV"));
events[1] = CreateEvent(nullptr, TRUE, FALSE, TEXT("FinishedSRV"));
if (!events[1]) {
goto aevent_cleanup;
}

2
netwerk/sctp/src/user_environment.c
View File

@ -92,7 +92,7 @@ read_random_phony(void *buf, int count)
/* Fill buf[] with random(9) output */
for (i = 0; i < count; i+= (int)sizeof(uint32_t)) {
randval = random();
size = MIN(count - i, sizeof(uint32_t));
size = MIN(count - i, (int)sizeof(uint32_t));
memcpy(&((char *)buf)[i], &randval, (size_t)size);
}

18
tools/jprof/bfd.cpp
View File

@ -18,7 +18,7 @@ static bfd *try_debug_file(const char *filename, unsigned long crc32)
{
int fd = open(filename, O_RDONLY);
if (fd < 0)
return NULL;
return nullptr;
unsigned char buf[4*1024];
unsigned long crc = 0;
@ -34,12 +34,12 @@ static bfd *try_debug_file(const char *filename, unsigned long crc32)
close(fd);
if (crc != crc32)
return NULL;
return nullptr;
bfd *object = bfd_openr(filename, NULL);
bfd *object = bfd_openr(filename, nullptr);
if (!bfd_check_format(object, bfd_object)) {
bfd_close(object);
return NULL;
return nullptr;
}
return object;
@ -51,7 +51,7 @@ static bfd *find_debug_file(bfd *lib, const char *aFileName)
asection *sect = bfd_get_section_by_name(lib, ".gnu_debuglink");
if (!sect)
return NULL;
return nullptr;
bfd_size_type debuglinkSize = bfd_section_size (objfile->obfd, sect);
@ -125,7 +125,7 @@ Symbol ** leaky::ExtendSymbols(int num)
void leaky::ReadSymbols(const char *aFileName, u_long aBaseAddress)
{
int initialSymbols = usefulSymbols;
if (NULL == externalSymbols) {
if (nullptr == externalSymbols) {
externalSymbols = (Symbol**) calloc(sizeof(Symbol*),10000);
Symbol *new_array = new Symbol[10000];
for (int i = 0; i < 10000; i++) {
@ -149,8 +149,8 @@ void leaky::ReadSymbols(const char *aFileName, u_long aBaseAddress)
bfd_init ();
}
bfd* lib = bfd_openr(aFileName, NULL);
if (NULL == lib) {
bfd* lib = bfd_openr(aFileName, nullptr);
if (nullptr == lib) {
return;
}
if (!bfd_check_format(lib, bfd_object)) {
@ -199,7 +199,7 @@ void leaky::ReadSymbols(const char *aFileName, u_long aBaseAddress)
// if ((syminfo.type == 'T') || (syminfo.type == 't')) {
const char* nm = bfd_asymbol_name(sym);
if (nm && nm[0]) {
char* dnm = NULL;
char* dnm = nullptr;
if (strncmp("__thunk", nm, 7)) {
dnm = abi::__cxa_demangle(nm, 0, 0, 0);
}

2
tools/jprof/coff.cpp
View File

@ -38,7 +38,7 @@ void leaky::readSymbols(const char *fileName)
{
LDFILE *ldptr;
ldptr = ldopen(fileName, NULL);
ldptr = ldopen(fileName, nullptr);
if (!ldptr) {
fprintf(stderr, "%s: unable to open \"%s\"\n", applicationName,
fileName);

30
tools/jprof/leaky.cpp
View File

@ -59,7 +59,7 @@ int main(int argc, char** argv)
if (l->outputfd != stderr) {
fclose(l->outputfd);
l->outputfd = NULL;
l->outputfd = nullptr;
}
}
}
@ -115,8 +115,8 @@ htmlify(const char *in)
leaky::leaky()
{
applicationName = NULL;
progFile = NULL;
applicationName = nullptr;
progFile = nullptr;
quiet = true;
showAddress = false;
@ -135,7 +135,7 @@ leaky::leaky()
lowestSymbolAddr = 0;
highestSymbolAddr = 0;
loadMap = NULL;
loadMap = nullptr;
collect_last = false;
collect_start = -1;
@ -167,14 +167,14 @@ void leaky::usageError()
}
static struct option longopts[] = {
{ "threads", 0, NULL, 't' },
{ "only-thread", 1, NULL, 'T' },
{ "last", 0, NULL, 'l' },
{ "start", 1, NULL, 'x' },
{ "end", 1, NULL, 'n' },
{ "cleo",0, NULL, 'c' },
{ "output-dir", 1, NULL, 'd' },
{ NULL, 0, NULL, 0 },
{ "threads", 0, nullptr, 't' },
{ "only-thread", 1, nullptr, 'T' },
{ "last", 0, nullptr, 'l' },
{ "start", 1, nullptr, 'x' },
{ "end", 1, nullptr, 'n' },
{ "cleo",0, nullptr, 'c' },
{ "output-dir", 1, nullptr, 'd' },
{ nullptr, 0, nullptr, 0 },
};
void leaky::initialize(int argc, char** argv)
@ -192,7 +192,7 @@ void leaky::initialize(int argc, char** argv)
int longindex = 0;
onlyThread = 0;
output_dir = NULL;
output_dir = nullptr;
cleo = false;
// XXX tons of cruft here left over from tracemalloc
@ -464,7 +464,7 @@ static int symbolOrder(void const* a, void const* b)
void leaky::ReadSharedLibrarySymbols()
{
LoadMapEntry* lme = loadMap;
while (NULL != lme) {
while (nullptr != lme) {
ReadSymbols(lme->name, lme->address);
lme = lme->next;
}
@ -526,7 +526,7 @@ Symbol* leaky::findSymbol(u_long addr)
int idx = findSymbolIndex(addr);
if(idx<0) {
return NULL;
return nullptr;
} else {
return externalSymbols[idx];
}

20
tools/jprof/stub/libmalloc.cpp
View File

@ -171,7 +171,7 @@ static void DumpAddressMap()
if (mfd >= 0) {
malloc_map_entry mme;
link_map* map = _r_debug.r_map;
while (NULL != map) {
while (nullptr != map) {
if (map->l_name && *map->l_name) {
mme.nameLen = strlen(map->l_name);
mme.address = map->l_addr;
@ -439,9 +439,9 @@ static void startSignalCounter(unsigned long millisec)
tvalue.it_value.tv_usec = (millisec%1000)*1000;
if (realTime) {
setitimer(ITIMER_REAL, &tvalue, NULL);
setitimer(ITIMER_REAL, &tvalue, nullptr);
} else {
setitimer(ITIMER_PROF, &tvalue, NULL);
setitimer(ITIMER_PROF, &tvalue, nullptr);
}
}
@ -456,7 +456,7 @@ static int setupRTCSignals(int hz, struct sigaction *sap)
return 0;
}
if (sigaction(SIGIO, sap, NULL) == -1) {
if (sigaction(SIGIO, sap, nullptr) == -1) {
perror("JPROF_RTC setup: sigaction(SIGIO)");
return 0;
}
@ -617,7 +617,7 @@ NS_EXPORT_(void) setupProfilingStuff(void)
char *delay = strstr(tst,"JP_PERIOD=");
if(delay) {
double tmp = strtod(delay+strlen("JP_PERIOD="), NULL);
double tmp = strtod(delay+strlen("JP_PERIOD="), nullptr);
if (tmp>=1e-3) {
timerMilliSec = static_cast<unsigned long>(1000 * tmp);
} else {
@ -708,7 +708,7 @@ NS_EXPORT_(void) setupProfilingStuff(void)
// FIX! probably should block these against each other
// Very unlikely.
sigemptyset(&mset);
action.sa_handler = NULL;
action.sa_handler = nullptr;
action.sa_sigaction = StackHook;
action.sa_mask = mset;
action.sa_flags = SA_RESTART | SA_SIGINFO;
@ -725,11 +725,11 @@ NS_EXPORT_(void) setupProfilingStuff(void)
#endif
{
if (realTime) {
sigaction(SIGALRM, &action, NULL);
sigaction(SIGALRM, &action, nullptr);
}
}
// enable PROF in all cases to simplify JP_DEFER/pause/restart
sigaction(SIGPROF, &action, NULL);
sigaction(SIGPROF, &action, nullptr);
// make it so a SIGUSR1 will stop the profiling
// Note: It currently does not close the logfile.
@ -740,14 +740,14 @@ NS_EXPORT_(void) setupProfilingStuff(void)
stop_action.sa_handler = EndProfilingHook;
stop_action.sa_mask = mset;
stop_action.sa_flags = SA_RESTART;
sigaction(SIGUSR1, &stop_action, NULL);
sigaction(SIGUSR1, &stop_action, nullptr);
// make it so a SIGUSR2 will clear the circular buffer
stop_action.sa_handler = ClearProfilingHook;
stop_action.sa_mask = mset;
stop_action.sa_flags = SA_RESTART;
sigaction(SIGUSR2, &stop_action, NULL);
sigaction(SIGUSR2, &stop_action, nullptr);
printf("Jprof: Initialized signal handler and set "
"timer for %lu %s, %d s "

4
tools/trace-malloc/leaksoup.cpp
View File

@ -102,7 +102,7 @@ int main(int argc, char **argv)
return 1;
}
NS_InitXPCOM2(NULL, NULL, NULL);
NS_InitXPCOM2(nullptr, nullptr, nullptr);
ADLog log;
if (!log.Read(argv[1])) {
@ -401,7 +401,7 @@ int main(int argc, char **argv)
delete [] sorted_nodes;
delete [] nodes;
NS_ShutdownXPCOM(NULL);
NS_ShutdownXPCOM(nullptr);
return 0;
}

14
widget/android/AndroidBridge.cpp
View File

@ -164,7 +164,7 @@ AndroidBridge::Init(JNIEnv *jEnv)
mJNIEnv = nullptr;
mThread = -1;
mGLControllerObj = NULL;
mGLControllerObj = nullptr;
mOpenedGraphicsLibraries = false;
mHasNativeBitmapAccess = false;
mHasNativeWindowAccess = false;
@ -269,11 +269,11 @@ extern "C" {
__attribute__ ((visibility("default")))
JNIEnv * GetJNIForThread()
{
JNIEnv *jEnv = NULL;
JNIEnv *jEnv = nullptr;
JavaVM *jVm = mozilla::AndroidBridge::GetVM();
if (!jVm) {
__android_log_print(ANDROID_LOG_INFO, "GetJNIForThread", "Returned a null VM");
return NULL;
return nullptr;
}
jEnv = static_cast<JNIEnv*>(PR_GetThreadPrivate(sJavaEnvThreadIndex));
@ -283,10 +283,10 @@ extern "C" {
int status = jVm->GetEnv((void**) &jEnv, JNI_VERSION_1_2);
if (status) {
status = jVm->AttachCurrentThread(&jEnv, NULL);
status = jVm->AttachCurrentThread(&jEnv, nullptr);
if (status) {
__android_log_print(ANDROID_LOG_INFO, "GetJNIForThread", "Could not attach");
return NULL;
return nullptr;
}
PR_SetThreadPrivate(sJavaEnvThreadIndex, jEnv);
@ -304,7 +304,7 @@ void AutoGlobalWrappedJavaObject::Dispose() {
}
GetJNIForThread()->DeleteGlobalRef(wrapped_obj);
wrapped_obj = NULL;
wrapped_obj = nullptr;
}
AutoGlobalWrappedJavaObject::~AutoGlobalWrappedJavaObject() {
@ -694,7 +694,7 @@ AndroidBridge::SetLayerClient(JNIEnv* env, jobject jobj)
void
AndroidBridge::RegisterCompositor(JNIEnv *env)
{
if (mGLControllerObj != NULL && !mGLControllerObj->isNull()) {
if (mGLControllerObj != nullptr && !mGLControllerObj->isNull()) {
// we already have this set up, no need to do it again
return;
}

2
widget/android/AndroidJNI.cpp
View File

@ -911,7 +911,7 @@ Java_org_mozilla_gecko_gfx_NativePanZoomController_destroy(JNIEnv* env, jobject
return;
}
NativePanZoomController* oldRef = AndroidBridge::Bridge()->SetNativePanZoomController(NULL);
NativePanZoomController* oldRef = AndroidBridge::Bridge()->SetNativePanZoomController(nullptr);
if (!oldRef || oldRef->isNull()) {
MOZ_ASSERT(false, "Clearing a non-existent NPZC");
} else {

12
widget/android/AndroidJavaWrappers.h
View File

@ -67,10 +67,10 @@ private:
class WrappedJavaObject {
public:
WrappedJavaObject() :
wrapped_obj(NULL)
wrapped_obj(nullptr)
{ }
WrappedJavaObject(jobject jobj) : wrapped_obj(NULL) {
WrappedJavaObject(jobject jobj) : wrapped_obj(nullptr) {
Init(jobj);
}
@ -79,7 +79,7 @@ public:
}
bool isNull() const {
return wrapped_obj == NULL;
return wrapped_obj == nullptr;
}
jobject wrappedObject() const {
@ -93,10 +93,10 @@ protected:
class AutoGlobalWrappedJavaObject : protected WrappedJavaObject{
public:
AutoGlobalWrappedJavaObject() :
wrapped_obj(NULL)
wrapped_obj(nullptr)
{ }
AutoGlobalWrappedJavaObject(jobject jobj, JNIEnv* env) : wrapped_obj(NULL) {
AutoGlobalWrappedJavaObject(jobject jobj, JNIEnv* env) : wrapped_obj(nullptr) {
Init(jobj, env);
}
@ -111,7 +111,7 @@ public:
}
bool isNull() const {
return wrapped_obj == NULL;
return wrapped_obj == nullptr;
}
jobject wrappedObject() const {

2
widget/nsIWidget.h
View File

@ -504,7 +504,7 @@ class nsIWidget : public nsISupports {
/**
* Create and initialize a widget.
*
* All the arguments can be NULL in which case a top level window
* All the arguments can be null in which case a top level window
* with size 0 is created. The event callback function has to be
* provided only if the caller wants to deal with the events this
* widget receives. The event callback is basically a preprocess

6
xpcom/base/nsMemoryReporterManager.cpp
View File

@ -212,7 +212,7 @@ GetKinfoVmentrySelf(int64_t* prss, uint64_t* maxreg)
{
int cnt;
struct kinfo_vmentry *vmmap, *kve;
if ((vmmap = kinfo_getvmmap(getpid(), &cnt)) == NULL)
if ((vmmap = kinfo_getvmmap(getpid(), &cnt)) == nullptr)
return NS_ERROR_FAILURE;
if (prss)
@ -238,7 +238,7 @@ static nsresult
PrivateDistinguishedAmount(int64_t* aN)
{
int64_t priv;
nsresult rv = GetKinfoVmentrySelf(&priv, NULL);
nsresult rv = GetKinfoVmentrySelf(&priv, nullptr);
NS_ENSURE_SUCCESS(rv, rv);
*aN = priv * getpagesize();
return NS_OK;
@ -249,7 +249,7 @@ static nsresult
VsizeMaxContiguousDistinguishedAmount(int64_t* aN)
{
uint64_t biggestRegion;
nsresult rv = GetKinfoVmentrySelf(NULL, &biggestRegion);
nsresult rv = GetKinfoVmentrySelf(nullptr, &biggestRegion);
if (NS_SUCCEEDED(rv))
*aN = biggestRegion;