Bug 882616 - Fix build warnings in docshell/base; r=bz

This commit is contained in:
Ms2ger 2013-06-23 09:15:05 +02:00
parent 41c8fbc796
commit 9f598cd603
3 changed files with 14 additions and 8 deletions

View File

@ -37,21 +37,25 @@ public:
LoadContext(const IPC::SerializedLoadContext& aToCopy,
nsIDOMElement* aTopFrameElement,
uint32_t aAppId, bool aInBrowser)
: mIsNotNull(aToCopy.mIsNotNull)
: mTopFrameElement(do_GetWeakReference(aTopFrameElement))
, mAppId(aAppId)
, mIsContent(aToCopy.mIsContent)
, mUsePrivateBrowsing(aToCopy.mUsePrivateBrowsing)
, mIsInBrowserElement(aInBrowser)
, mAppId(aAppId)
, mTopFrameElement(do_GetWeakReference(aTopFrameElement))
#ifdef DEBUG
, mIsNotNull(aToCopy.mIsNotNull)
#endif
{}
private:
bool mIsNotNull;
nsWeakPtr mTopFrameElement;
uint32_t mAppId;
bool mIsContent;
bool mUsePrivateBrowsing;
bool mIsInBrowserElement;
uint32_t mAppId;
nsWeakPtr mTopFrameElement;
#ifdef DEBUG
bool mIsNotNull;
#endif
};
} // namespace mozilla

View File

@ -10,6 +10,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
FAIL_ON_WARNINGS := 1
LIBRARY_NAME = basedocshell_s
MSVC_ENABLE_PGO := 1
LIBXUL_LIBRARY = 1

View File

@ -10,6 +10,7 @@
#include "mozilla/Attributes.h"
#include "mozilla/AutoRestore.h"
#include "mozilla/Casting.h"
#include "mozilla/dom/ContentChild.h"
#include "mozilla/dom/Element.h"
#include "mozilla/dom/TabChild.h"
@ -809,7 +810,7 @@ nsDocShell::nsDocShell():
++gNumberOfDocShells;
if (!PR_GetEnv("MOZ_QUIET")) {
printf("++DOCSHELL %p == %ld [id = %llu]\n", (void*) this,
gNumberOfDocShells, mHistoryID);
gNumberOfDocShells, SafeCast<unsigned long long>(mHistoryID));
}
#endif
}
@ -838,7 +839,7 @@ nsDocShell::~nsDocShell()
--gNumberOfDocShells;
if (!PR_GetEnv("MOZ_QUIET")) {
printf("--DOCSHELL %p == %ld [id = %llu]\n", (void*) this,
gNumberOfDocShells, mHistoryID);
gNumberOfDocShells, SafeCast<unsigned long long>(mHistoryID));
}
#endif
}