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 m-c to inbound.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2012-10-26 16:06:04 -04:00
commit 22439e63c4
9 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/base/src/nsNodeUtils.cpp
View File

@ -45,8 +45,7 @@ using namespace mozilla::dom;
nsINode* node = content_; \
NS_ASSERTION(node->OwnerDoc() == doc, "Bogus document"); \
if (doc) { \
static_cast<nsIMutationObserver*>(doc->BindingManager())-> \
func_ params_; \
doc->BindingManager()->func_ params_; \
} \
do { \
nsINode::nsSlots* slots = node->GetExistingSlots(); \

1
content/base/src/nsStubDocumentObserver.h
View File

@ -27,6 +27,7 @@
* prediction)
*/
class nsStubDocumentObserver : public nsIDocumentObserver {
public:
NS_DECL_NSIDOCUMENTOBSERVER
};

1
content/base/src/nsStubMutationObserver.h
View File

@ -27,6 +27,7 @@
* prediction)
*/
class nsStubMutationObserver : public nsIMutationObserver {
public:
NS_DECL_NSIMUTATIONOBSERVER
};

1
content/xbl/src/Makefile.in
View File

@ -13,6 +13,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = content
LIBRARY_NAME = gkconxbl_s
LIBXUL_LIBRARY = 1
FAIL_ON_WARNINGS = 1
CPPSRCS = \
nsXBLBinding.cpp \

3
content/xbl/src/nsXBLDocumentInfo.cpp
View File

@ -29,6 +29,7 @@
#include "mozilla/scache/StartupCacheUtils.h"
#include "nsCCUncollectableMarker.h"
#include "mozilla/dom/BindingUtils.h"
#include "mozilla/Util.h"
using namespace mozilla::scache;
using namespace mozilla;
@ -264,7 +265,7 @@ nsXBLDocGlobalObject::EnsureScriptEnvironment()
// NOTE: We init this context with a NULL global, so we automatically
// hook up to the existing nsIScriptGlobalObject global setup by
// nsGlobalWindow.
nsresult rv = newCtx->InitContext();
DebugOnly<nsresult> rv = newCtx->InitContext();
NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Script Language's InitContext failed");
newCtx->SetGCOnDestruction(false);
newCtx->DidInitializeContext();

1
js/src/gc/Root.h
View File

@ -522,6 +522,7 @@ struct RootSink<JSStableString *> {
static void dispose(JSStableString *ptr) {
JSStableString * volatile sink;
sink = ptr;
(void)sink; // silence GCC unused-but-set-variable build warning
}
};
#endif

2
media/mtransport/transportlayerdtls.cpp
View File

@ -380,7 +380,7 @@ void TransportLayerDtls::WasInserted() {
if (!Setup()) {
SetState(TS_ERROR);
}
};
}
nsresult TransportLayerDtls::SetVerificationAllowAll() {

2
media/mtransport/transportlayerdtls.h
View File

@ -113,7 +113,7 @@ class TransportLayerDtls : public TransportLayer {
len_ = len;
}
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VerificationDigest);
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VerificationDigest)
std::string algorithm_;
size_t len_;

2
media/mtransport/transportlayerprsock.cpp
View File

@ -112,5 +112,5 @@ void TransportLayerPrsock::OnSocketReady(PRFileDesc *fd, int16_t outflags) {
}
}
NS_IMPL_THREADSAFE_ISUPPORTS0(TransportLayerPrsock::SocketHandler);
NS_IMPL_THREADSAFE_ISUPPORTS0(TransportLayerPrsock::SocketHandler)
} // close namespace