- Revision
- 116198
- Author
- [email protected]
- Date
- 2012-05-04 17:54:03 -0700 (Fri, 04 May 2012)
Log Message
Remove uses of ASSERT(false)
https://bugs.webkit.org/show_bug.cgi?id=85686
Reviewed by Dean Jackson.
Replace uses of ASSERT(false) with ASSERT_NOT_REACHED(). Also, in two places, there was code structured like:
if (expr) {
// do something
} else {
ASSERT(false);
}
Replace this with:
ASSERT(expr);
if (!expr)
return;
// do something
* Modules/webdatabase/DatabaseTracker.cpp:
(WebCore::DatabaseTracker::deleteOrigin):
(WebCore::DatabaseTracker::doneCreatingDatabase):
(WebCore::DatabaseTracker::doneDeletingDatabase):
(WebCore::DatabaseTracker::deleteDatabase):
* bridge/objc/objc_instance.mm:
(ObjcInstance::invokeObjcMethod):
* bridge/objc/objc_utility.mm:
(JSC::Bindings::convertObjcValueToValue):
(JSC::Bindings::objcValueTypeForType):
* dom/Node.cpp:
(WebCore::Node::createRenderer):
* loader/icon/IconDatabase.cpp:
(WebCore::IconDatabase::setIconURLForPageURLInSQLDatabase):
(WebCore::IconDatabase::setIconIDForPageURLInSQLDatabase):
* platform/graphics/GraphicsContext3D.cpp:
(WebCore::doPacking):
* platform/text/BidiResolver.h:
(WebCore::::createBidiRunsForLine):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (116197 => 116198)
--- trunk/Source/WebCore/ChangeLog 2012-05-05 00:54:01 UTC (rev 116197)
+++ trunk/Source/WebCore/ChangeLog 2012-05-05 00:54:03 UTC (rev 116198)
@@ -1,3 +1,46 @@
+2012-05-04 Andy Estes <[email protected]>
+
+ Remove uses of ASSERT(false)
+ https://bugs.webkit.org/show_bug.cgi?id=85686
+
+ Reviewed by Dean Jackson.
+
+ Replace uses of ASSERT(false) with ASSERT_NOT_REACHED(). Also, in two places, there was code structured like:
+
+ if (expr) {
+ // do something
+ } else {
+ ASSERT(false);
+ }
+
+ Replace this with:
+
+ ASSERT(expr);
+ if (!expr)
+ return;
+
+ // do something
+
+ * Modules/webdatabase/DatabaseTracker.cpp:
+ (WebCore::DatabaseTracker::deleteOrigin):
+ (WebCore::DatabaseTracker::doneCreatingDatabase):
+ (WebCore::DatabaseTracker::doneDeletingDatabase):
+ (WebCore::DatabaseTracker::deleteDatabase):
+ * bridge/objc/objc_instance.mm:
+ (ObjcInstance::invokeObjcMethod):
+ * bridge/objc/objc_utility.mm:
+ (JSC::Bindings::convertObjcValueToValue):
+ (JSC::Bindings::objcValueTypeForType):
+ * dom/Node.cpp:
+ (WebCore::Node::createRenderer):
+ * loader/icon/IconDatabase.cpp:
+ (WebCore::IconDatabase::setIconURLForPageURLInSQLDatabase):
+ (WebCore::IconDatabase::setIconIDForPageURLInSQLDatabase):
+ * platform/graphics/GraphicsContext3D.cpp:
+ (WebCore::doPacking):
+ * platform/text/BidiResolver.h:
+ (WebCore::::createBidiRunsForLine):
+
2012-05-04 Noel Gordon <[email protected]>
[CG] Minor refactor of ImageBuffer::CGImageToDataURL and its callers
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp (116197 => 116198)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2012-05-05 00:54:01 UTC (rev 116197)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp 2012-05-05 00:54:03 UTC (rev 116198)
@@ -759,7 +759,7 @@
}
if (!canDeleteOrigin(origin)) {
LOG_ERROR("Tried to delete an origin (%s) while either creating database in it or already deleting it", origin->databaseIdentifier().ascii().data());
- ASSERT(false);
+ ASSERT_NOT_REACHED();
return false;
}
recordDeletingOrigin(origin);
@@ -853,19 +853,20 @@
{
ASSERT(!m_databaseGuard.tryLock());
NameCountMap* nameMap = m_beingCreated.get(origin);
- if (nameMap) {
- long count = nameMap->get(name);
- ASSERT(count > 0);
- if (count <= 1) {
- nameMap->remove(name);
- if (nameMap->isEmpty()) {
- m_beingCreated.remove(origin);
- delete nameMap;
- }
- } else
- nameMap->set(name, count - 1);
+ ASSERT(nameMap);
+ if (!nameMap)
+ return;
+
+ long count = nameMap->get(name);
+ ASSERT(count > 0);
+ if (count <= 1) {
+ nameMap->remove(name);
+ if (nameMap->isEmpty()) {
+ m_beingCreated.remove(origin);
+ delete nameMap;
+ }
} else
- ASSERT(false);
+ nameMap->set(name, count - 1);
}
bool DatabaseTracker::creatingDatabase(SecurityOrigin *origin, const String& name)
@@ -898,15 +899,15 @@
{
ASSERT(!m_databaseGuard.tryLock());
NameSet* nameSet = m_beingDeleted.get(origin);
- if (nameSet) {
- ASSERT(nameSet->contains(name));
- nameSet->remove(name);
- if (nameSet->isEmpty()) {
- m_beingDeleted.remove(origin);
- delete nameSet;
- }
- } else {
- ASSERT(false);
+ ASSERT(nameSet);
+ if (!nameSet)
+ return;
+
+ ASSERT(nameSet->contains(name));
+ nameSet->remove(name);
+ if (nameSet->isEmpty()) {
+ m_beingDeleted.remove(origin);
+ delete nameSet;
}
}
@@ -952,7 +953,7 @@
return false;
if (!canDeleteDatabase(origin, name)) {
- ASSERT(FALSE);
+ ASSERT_NOT_REACHED();
return false;
}
recordDeletingDatabase(origin, name);
Modified: trunk/Source/WebCore/bridge/objc/objc_instance.mm (116197 => 116198)
--- trunk/Source/WebCore/bridge/objc/objc_instance.mm 2012-05-05 00:54:01 UTC (rev 116197)
+++ trunk/Source/WebCore/bridge/objc/objc_instance.mm 2012-05-05 00:54:03 UTC (rev 116198)
@@ -315,7 +315,7 @@
// the assert above should have fired in the impossible case
// of an invalid type anyway).
fprintf(stderr, "%s: invalid type (%d)\n", __PRETTY_FUNCTION__, (int)objcValueType);
- ASSERT(false);
+ ASSERT_NOT_REACHED();
}
}
}
Modified: trunk/Source/WebCore/bridge/objc/objc_utility.mm (116197 => 116198)
--- trunk/Source/WebCore/bridge/objc/objc_utility.mm 2012-05-05 00:54:01 UTC (rev 116197)
+++ trunk/Source/WebCore/bridge/objc/objc_utility.mm 2012-05-05 00:54:03 UTC (rev 116198)
@@ -232,7 +232,7 @@
default:
// Should never get here. Argument types are filtered.
fprintf(stderr, "%s: invalid type (%d)\n", __PRETTY_FUNCTION__, (int)type);
- ASSERT(false);
+ ASSERT_NOT_REACHED();
}
return jsUndefined();
@@ -298,7 +298,7 @@
default:
// Unhandled type. We don't handle C structs, unions, etc.
// FIXME: throw an exception?
- ASSERT(false);
+ ASSERT_NOT_REACHED();
}
if (objcValueType != ObjcInvalidType)
Modified: trunk/Source/WebCore/dom/Node.cpp (116197 => 116198)
--- trunk/Source/WebCore/dom/Node.cpp 2012-05-05 00:54:01 UTC (rev 116197)
+++ trunk/Source/WebCore/dom/Node.cpp 2012-05-05 00:54:03 UTC (rev 116198)
@@ -1434,7 +1434,7 @@
RenderObject* Node::createRenderer(RenderArena*, RenderStyle*)
{
- ASSERT(false);
+ ASSERT_NOT_REACHED();
return 0;
}
Modified: trunk/Source/WebCore/loader/icon/IconDatabase.cpp (116197 => 116198)
--- trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2012-05-05 00:54:01 UTC (rev 116197)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2012-05-05 00:54:03 UTC (rev 116198)
@@ -1895,7 +1895,7 @@
if (!iconID) {
LOG_ERROR("Failed to establish an ID for iconURL %s", urlForLogging(iconURL).ascii().data());
- ASSERT(false);
+ ASSERT_NOT_REACHED();
return;
}
@@ -1912,7 +1912,7 @@
int result = m_setIconIDForPageURLStatement->step();
if (result != SQLResultDone) {
- ASSERT(false);
+ ASSERT_NOT_REACHED();
LOG_ERROR("setIconIDForPageURLQuery failed for url %s", urlForLogging(pageURL).ascii().data());
}
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp (116197 => 116198)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp 2012-05-05 00:54:01 UTC (rev 116197)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp 2012-05-05 00:54:03 UTC (rev 116198)
@@ -1348,7 +1348,7 @@
break;
}
default:
- ASSERT(false);
+ ASSERT_NOT_REACHED();
}
}
Modified: trunk/Source/WebCore/platform/text/BidiResolver.h (116197 => 116198)
--- trunk/Source/WebCore/platform/text/BidiResolver.h 2012-05-05 00:54:01 UTC (rev 116197)
+++ trunk/Source/WebCore/platform/text/BidiResolver.h 2012-05-05 00:54:03 UTC (rev 116198)
@@ -854,7 +854,7 @@
m_direction = m_status.lastStrong == LeftToRight ? LeftToRight : EuropeanNumber;
break;
default:
- ASSERT(false);
+ ASSERT_NOT_REACHED();
}
appendRun();
}
