diff options
| -rw-r--r-- | js/src/jsfun.h | 1 | ||||
| -rw-r--r-- | layout/generic/nsGridContainerFrame.cpp | 1 | ||||
| -rw-r--r-- | layout/generic/nsPageContentFrame.cpp | 2 | ||||
| -rw-r--r-- | layout/generic/nsPageFrame.cpp | 2 | ||||
| -rw-r--r-- | layout/generic/nsVideoFrame.cpp | 4 | ||||
| -rw-r--r-- | netwerk/base/nsSocketTransport2.h | 4 | ||||
| -rw-r--r-- | netwerk/protocol/http/nsHttpConnectionMgr.cpp | 2 |
7 files changed, 7 insertions, 9 deletions
diff --git a/js/src/jsfun.h b/js/src/jsfun.h index 481f062080..a139bc336a 100644 --- a/js/src/jsfun.h +++ b/js/src/jsfun.h @@ -361,7 +361,6 @@ class JSFunction : public js::NativeObject MOZ_ASSERT(!hasCompileTimeName()); MOZ_ASSERT(!hasGuessedAtom()); MOZ_ASSERT(!isBoundFunction()); - MOZ_ASSERT(js::AtomIsMarked(zone(), atom)); atom_ = atom; flags_ |= HAS_GUESSED_ATOM; } diff --git a/layout/generic/nsGridContainerFrame.cpp b/layout/generic/nsGridContainerFrame.cpp index 34113e4fa7..1e1afac234 100644 --- a/layout/generic/nsGridContainerFrame.cpp +++ b/layout/generic/nsGridContainerFrame.cpp @@ -5887,7 +5887,6 @@ nsGridContainerFrame::ReflowChildren(GridReflowInput& aState, nsReflowStatus& aStatus) { MOZ_ASSERT(aState.mReflowInput); - MOZ_ASSERT(aStatus.IsEmpty(), "Caller should pass a fresh reflow status!"); aStatus = NS_FRAME_COMPLETE; nsOverflowAreas ocBounds; diff --git a/layout/generic/nsPageContentFrame.cpp b/layout/generic/nsPageContentFrame.cpp index cb558374db..5a7af2ec85 100644 --- a/layout/generic/nsPageContentFrame.cpp +++ b/layout/generic/nsPageContentFrame.cpp @@ -91,7 +91,7 @@ nsPageContentFrame::Reflow(nsPresContext* aPresContext, FinishReflowChild(frame, aPresContext, aDesiredSize, &kidReflowInput, 0, 0, ReflowChildFlags::Default); - NS_ASSERTION(aPresContext->IsDynamic() || !aStatus.IsFullyComplete() || + NS_ASSERTION(aPresContext->IsDynamic() || !NS_FRAME_IS_FULLY_COMPLETE(aStatus) || !frame->GetNextInFlow(), "bad child flow list"); } diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp index 6120e35103..1327b3932b 100644 --- a/layout/generic/nsPageFrame.cpp +++ b/layout/generic/nsPageFrame.cpp @@ -148,7 +148,7 @@ nsPageFrame::Reflow(nsPresContext* aPresContext, FinishReflowChild(frame, aPresContext, aDesiredSize, &kidReflowInput, xc, yc, ReflowChildFlags::Default); - NS_ASSERTION(!aStatus.IsFullyComplete() || !frame->GetNextInFlow(), + NS_ASSERTION(!NS_FRAME_IS_FULLY_COMPLETE(aStatus) || !frame->GetNextInFlow(), "bad child flow list"); } PR_PL(("PageFrame::Reflow %p ", this)); diff --git a/layout/generic/nsVideoFrame.cpp b/layout/generic/nsVideoFrame.cpp index 7986f672c1..fb7cefd504 100644 --- a/layout/generic/nsVideoFrame.cpp +++ b/layout/generic/nsVideoFrame.cpp @@ -337,7 +337,7 @@ nsVideoFrame::Reflow(nsPresContext* aPresContext, ReflowChild(imageFrame, aPresContext, kidDesiredSize, kidReflowInput, posterRenderRect.x, posterRenderRect.y, ReflowChildFlags::Default, childStatus); - MOZ_ASSERT(childStatus.IsFullyComplete(), + MOZ_ASSERT(NS_FRAME_IS_FULLY_COMPLETE(childStatus), "We gave our child unconstrained available block-size, " "so it should be complete!"); @@ -380,7 +380,7 @@ nsVideoFrame::Reflow(nsPresContext* aPresContext, ReflowChild(child, aPresContext, kidDesiredSize, kidReflowInput, mBorderPadding.left, mBorderPadding.top, ReflowChildFlags::Default, childStatus); - MOZ_ASSERT(childStatus.IsFullyComplete(), + MOZ_ASSERT(NS_FRAME_IS_FULLY_COMPLETE(childStatus), "We gave our child unconstrained available block-size, " "so it should be complete!"); diff --git a/netwerk/base/nsSocketTransport2.h b/netwerk/base/nsSocketTransport2.h index a61e432b48..c36d46c04e 100644 --- a/netwerk/base/nsSocketTransport2.h +++ b/netwerk/base/nsSocketTransport2.h @@ -351,13 +351,13 @@ private: void OnMsgInputPending() { - MOZ_ASSERT(OnSocketThread(), "not on socket thread"); + NS_ASSERTION(PR_GetCurrentThread() == gSocketThread, "not on socket thread"); if (mState == STATE_TRANSFERRING) mPollFlags |= (PR_POLL_READ | PR_POLL_EXCEPT); } void OnMsgOutputPending() { - MOZ_ASSERT(OnSocketThread(), "not on socket thread"); + NS_ASSERTION(PR_GetCurrentThread() == gSocketThread, "not on socket thread"); if (mState == STATE_TRANSFERRING) mPollFlags |= (PR_POLL_WRITE | PR_POLL_EXCEPT); } diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp index 70d051f747..f23d9e9e9a 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp @@ -2630,7 +2630,7 @@ nsHttpConnectionMgr::OnMsgCompleteUpgrade(int32_t, ARefBase *param) void nsHttpConnectionMgr::OnMsgUpdateParam(int32_t inParam, ARefBase *) { - MOZ_ASSERT(OnSocketThread(), "not on socket thread"); + NS_ASSERTION(PR_GetCurrentThread() == gSocketThread, "not on socket thread"); uint32_t param = static_cast<uint32_t>(inParam); uint16_t name = ((param) & 0xFFFF0000) >> 16; uint16_t value = param & 0x0000FFFF; |