Reviewed by Kevin McCulough.
Global replace of "assert(" with "ASSERT(" to assist debugging. Removed
one instance of commented-out code containing "assert(" instead of replacing it.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@20495 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/rendering/bidi.cpp b/WebCore/rendering/bidi.cpp
index 444d855..ee8d416 100644
--- a/WebCore/rendering/bidi.cpp
+++ b/WebCore/rendering/bidi.cpp
@@ -258,7 +258,7 @@
#ifndef NDEBUG
--BidiRunCounter::count;
#endif
- assert(inBidiRunDestroy);
+ ASSERT(inBidiRunDestroy);
// Stash size where destroy() can find it.
*(size_t*)ptr = sz;
@@ -530,7 +530,7 @@
if (start >= end)
return;
- assert(start >= 0 && end < sBidiRunCount);
+ ASSERT(start >= 0 && end < sBidiRunCount);
// Get the item before the start of the runs to reverse and put it in
// |beforeStart|. |curr| should point to the first run to reverse.
@@ -722,9 +722,9 @@
BidiContext *c = bidi.context->parent;
if (c) {
if (!emptyRun && bidi.eor != bidi.last) {
- assert(bidi.status.eor != OtherNeutral);
+ ASSERT(bidi.status.eor != OtherNeutral);
// bidi.sor ... bidi.eor ... bidi.last eor; need to append the bidi.sor-bidi.eor run or extend it through bidi.last
- assert(bidi.status.last == EuropeanNumberSeparator
+ ASSERT(bidi.status.last == EuropeanNumberSeparator
|| bidi.status.last == EuropeanNumberTerminator
|| bidi.status.last == CommonNumberSeparator
|| bidi.status.last == BoundaryNeutral
@@ -782,9 +782,9 @@
if (level < 61) {
if (!emptyRun && bidi.eor != bidi.last) {
- assert(bidi.status.eor != OtherNeutral);
+ ASSERT(bidi.status.eor != OtherNeutral);
// bidi.sor ... bidi.eor ... bidi.last eor; need to append the bidi.sor-bidi.eor run or extend it through bidi.last
- assert(bidi.status.last == EuropeanNumberSeparator
+ ASSERT(bidi.status.last == EuropeanNumberSeparator
|| bidi.status.last == EuropeanNumberTerminator
|| bidi.status.last == CommonNumberSeparator
|| bidi.status.last == BoundaryNeutral
@@ -910,7 +910,7 @@
// We should have a root inline box. It should be unconstructed and
// be the last continuation of our line list.
- assert(lastLineBox() && !lastLineBox()->isConstructed());
+ ASSERT(lastLineBox() && !lastLineBox()->isConstructed());
// Set bits on our inline flow boxes that indicate which sides should
// paint borders/margins/padding. This knowledge will ultimately be used when
@@ -1102,7 +1102,7 @@
sLastBidiRun = 0;
sBidiRunCount = 0;
- assert(bidi.dir == OtherNeutral);
+ ASSERT(bidi.dir == OtherNeutral);
emptyRun = true;
@@ -1143,7 +1143,7 @@
dirCurrent = bidi.status.last;
}
- assert(bidi.status.eor != OtherNeutral);
+ ASSERT(bidi.status.eor != OtherNeutral);
switch (dirCurrent) {
// embedding and overrides (X1-X9 in the Bidi specs)
@@ -1395,7 +1395,7 @@
bidi.dir = bidi.status.lastStrong == LeftToRight ? LeftToRight : EuropeanNumber;
break;
default:
- assert(false);
+ ASSERT(false);
}
appendRun(bidi);
}
@@ -2196,7 +2196,7 @@
}
} else if (o->isInlineFlow()) {
// Only empty inlines matter. We treat those similarly to replaced elements.
- assert(!o->firstChild());
+ ASSERT(!o->firstChild());
tmpW += o->marginLeft() + o->borderLeft() + o->paddingLeft() +
o->marginRight() + o->borderRight() + o->paddingRight();
} else if (o->isReplaced()) {