forked from mirrors/gecko-dev
2824b29025
This patch was mostly generated by running the following scripts on the codebase, with some
manual changes made afterwards:
# static_assert.sh
#!/bin/bash
# Command to convert an NSPR integer type to the equivalent standard integer type
function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
! -wholename "*security/nss*" \
! -wholename "*/.hg*" \
! -wholename "obj-ff-dbg*" \
! -name nsXPCOMCID.h \
! -name prtypes.h \
-type f \
\( -iname "*.cpp" \
-o -iname "*.h" \
-o -iname "*.cc" \
-o -iname "*.mm" \) | \
xargs -n 1 `dirname $0`/assert_replacer.py #sed -i -e "s/\b$1\b/$2/g"
}
convert MOZ_STATIC_ASSERT static_assert
hg rev --no-backup mfbt/Assertions.h \
media/webrtc/signaling/src/sipcc/core/includes/ccapi.h \
modules/libmar/src/mar_private.h \
modules/libmar/src/mar.h
# assert_replacer.py
#!/usr/bin/python
import sys
import re
pattern = re.compile(r"\bMOZ_STATIC_ASSERT\b")
def replaceInPlace(fname):
print fname
f = open(fname, "rw+")
lines = f.readlines()
for i in range(0, len(lines)):
while True:
index = re.search(pattern, lines[i])
if index != None:
index = index.start()
lines[i] = lines[i][0:index] + "static_assert" + lines[i][index+len("MOZ_STATIC_ASSERT"):]
for j in range(i + 1, len(lines)):
if lines[j].find(" ", index) == index:
lines[j] = lines[j][0:index] + lines[j][index+4:]
else:
break
else:
break
f.seek(0, 0)
f.truncate()
f.write("".join(lines))
f.close()
argc = len(sys.argv)
for i in range(1, argc):
replaceInPlace(sys.argv[i])
--HG--
extra : rebase_source : 4b4a4047d82f2c205b9fad8d56dfc3f1afc0b045
74 lines
2.5 KiB
C++
74 lines
2.5 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef DEBUG
|
|
static_assert(false, "This should not be compiled in !DEBUG");
|
|
#endif // DEBUG
|
|
|
|
#include "nsAutoLayoutPhase.h"
|
|
#include "nsPresContext.h"
|
|
#include "nsContentUtils.h"
|
|
|
|
nsAutoLayoutPhase::nsAutoLayoutPhase(nsPresContext* aPresContext,
|
|
nsLayoutPhase aPhase)
|
|
: mPresContext(aPresContext)
|
|
, mPhase(aPhase)
|
|
, mCount(0)
|
|
{
|
|
Enter();
|
|
}
|
|
|
|
nsAutoLayoutPhase::~nsAutoLayoutPhase()
|
|
{
|
|
Exit();
|
|
MOZ_ASSERT(mCount == 0, "imbalanced");
|
|
}
|
|
|
|
void
|
|
nsAutoLayoutPhase::Enter()
|
|
{
|
|
switch (mPhase) {
|
|
case eLayoutPhase_Paint:
|
|
MOZ_ASSERT(mPresContext->mLayoutPhaseCount[eLayoutPhase_Paint] == 0,
|
|
"recurring into paint");
|
|
MOZ_ASSERT(mPresContext->mLayoutPhaseCount[eLayoutPhase_Reflow] == 0,
|
|
"painting in the middle of reflow");
|
|
MOZ_ASSERT(mPresContext->mLayoutPhaseCount[eLayoutPhase_FrameC] == 0,
|
|
"painting in the middle of frame construction");
|
|
break;
|
|
case eLayoutPhase_Reflow:
|
|
MOZ_ASSERT(mPresContext->mLayoutPhaseCount[eLayoutPhase_Paint] == 0,
|
|
"reflowing in the middle of a paint");
|
|
MOZ_ASSERT(mPresContext->mLayoutPhaseCount[eLayoutPhase_Reflow] == 0,
|
|
"recurring into reflow");
|
|
MOZ_ASSERT(mPresContext->mLayoutPhaseCount[eLayoutPhase_FrameC] == 0,
|
|
"reflowing in the middle of frame construction");
|
|
break;
|
|
case eLayoutPhase_FrameC:
|
|
MOZ_ASSERT(mPresContext->mLayoutPhaseCount[eLayoutPhase_Paint] == 0,
|
|
"constructing frames in the middle of a paint");
|
|
MOZ_ASSERT(mPresContext->mLayoutPhaseCount[eLayoutPhase_Reflow] == 0,
|
|
"constructing frames in the middle of reflow");
|
|
MOZ_ASSERT(mPresContext->mLayoutPhaseCount[eLayoutPhase_FrameC] == 0,
|
|
"recurring into frame construction");
|
|
MOZ_ASSERT(!nsContentUtils::IsSafeToRunScript(),
|
|
"constructing frames and scripts are not blocked");
|
|
break;
|
|
case eLayoutPhase_COUNT:
|
|
break;
|
|
}
|
|
|
|
++(mPresContext->mLayoutPhaseCount[mPhase]);
|
|
++mCount;
|
|
}
|
|
|
|
void
|
|
nsAutoLayoutPhase::Exit()
|
|
{
|
|
MOZ_ASSERT(mCount > 0 && mPresContext->mLayoutPhaseCount[mPhase] > 0,
|
|
"imbalanced");
|
|
--(mPresContext->mLayoutPhaseCount[mPhase]);
|
|
--mCount;
|
|
}
|