20814N/Adiff --git a/content/base/public/nsINode.h b/content/base/public/nsINode.h

20814N/A--- a/content/base/public/nsINode.h

20814N/A+++ b/content/base/public/nsINode.h

20814N/A@@ -1141,32 +1141,32 @@ private:

20814N/A ElementHasName,

20814N/A // Set if the element might have a contenteditable attribute set.

20814N/A ElementMayHaveContentEditableAttr,

20814N/A // Guard value

20814N/A BooleanFlagCount

20814N/A };

20814N/A

20814N/A void SetBoolFlag(BooleanFlag name, bool value) {

20814N/A- PR_STATIC_ASSERT(BooleanFlagCount <= 8*sizeof(mBoolFlags));

20814N/A+ PR_STATIC_ASSERT(BooleanFlagCount <= 8*4);

20814N/A mBoolFlags = (mBoolFlags & ~(1 << name)) | (value << name);

20814N/A }

20814N/A

20814N/A void SetBoolFlag(BooleanFlag name) {

20814N/A- PR_STATIC_ASSERT(BooleanFlagCount <= 8*sizeof(mBoolFlags));

20814N/A+ PR_STATIC_ASSERT(BooleanFlagCount <= 8*4);

20814N/A mBoolFlags |= (1 << name);

20814N/A }

20814N/A

20814N/A void ClearBoolFlag(BooleanFlag name) {

20814N/A- PR_STATIC_ASSERT(BooleanFlagCount <= 8*sizeof(mBoolFlags));

20814N/A+ PR_STATIC_ASSERT(BooleanFlagCount <= 8*4);

20814N/A mBoolFlags &= ~(1 << name);

20814N/A }

20814N/A

20814N/A bool GetBoolFlag(BooleanFlag name) const {

20814N/A- PR_STATIC_ASSERT(BooleanFlagCount <= 8*sizeof(mBoolFlags));

20814N/A+ PR_STATIC_ASSERT(BooleanFlagCount <= 8*4);

20814N/A return mBoolFlags & (1 << name);

20814N/A }

20814N/A

20814N/A public:

20814N/A bool HasRenderingObservers() const

20814N/A { return GetBoolFlag(NodeHasRenderingObservers); }

20814N/A void SetHasRenderingObservers(bool aValue)

20814N/A { SetBoolFlag(NodeHasRenderingObservers, aValue); }

20814N/Adiff --git a/content/media/wave/nsWaveReader.cpp b/content/media/wave/nsWaveReader.cpp

20814N/A--- a/content/media/wave/nsWaveReader.cpp

20814N/A+++ b/content/media/wave/nsWaveReader.cpp

20814N/A@@ -404,17 +404,17 @@ nsWaveReader::LoadFormatChunk()

20814N/A return PR_FALSE;

20814N/A }

20814N/A

20814N/A PR_STATIC_ASSERT(sizeof(PRUint16) +

20814N/A sizeof(PRUint16) +

20814N/A sizeof(PRUint32) +

20814N/A 4 +

20814N/A sizeof(PRUint16) +

20814N/A- sizeof(PRUint16) <= sizeof(waveFormat));

20814N/A+ sizeof(PRUint16) <= WAVE_FORMAT_CHUNK_SIZE);

20814N/A if (ReadUint16LE(&p) != WAVE_FORMAT_ENCODING_PCM) {

20814N/A NS_WARNING("WAVE is not uncompressed PCM, compressed encodings are not supported");

20814N/A return PR_FALSE;

20814N/A }

20814N/A

20814N/A channels = ReadUint16LE(&p);

20814N/A rate = ReadUint32LE(&p);

20814N/A

20814N/A@@ -433,17 +433,17 @@ nsWaveReader::LoadFormatChunk()

20814N/A if (fmtSize > WAVE_FORMAT_CHUNK_SIZE) {

20814N/A char extLength[2];

20814N/A const char* p = extLength;

20814N/A

20814N/A if (!ReadAll(extLength, sizeof(extLength))) {

20814N/A return PR_FALSE;

20814N/A }

20814N/A

20814N/A- PR_STATIC_ASSERT(sizeof(PRUint16) <= sizeof(extLength));

20814N/A+ PR_STATIC_ASSERT(sizeof(PRUint16) <= 2);

20814N/A PRUint16 extra = ReadUint16LE(&p);

20814N/A if (fmtSize - (WAVE_FORMAT_CHUNK_SIZE + 2) != extra) {

20814N/A NS_WARNING("Invalid extended format chunk size");

20814N/A return PR_FALSE;

20814N/A }

20814N/A extra += extra % 2;

20814N/A

20814N/A if (extra > 0) {