[webkit-changes] [105804] trunk/Source/WebCore

Tue, 24 Jan 2012 14:04:34 -0800

Title: [105804] trunk/Source/WebCore
Revision
105804
Author
[email protected]
Date
2012-01-24 14:04:14 -0800 (Tue, 24 Jan 2012)

Log Message

Unreviewed, rolling out r105238.
http://trac.webkit.org/changeset/105238
https://bugs.webkit.org/show_bug.cgi?id=76943

Remove the assert text hack as it served its purpose.
(Requested by dave_levin on #webkit).

Patch by Sheriff Bot <[email protected]> on 2012-01-24

* dom/ActiveDOMObject.cpp:
(WebCore::ContextDestructionObserver::ContextDestructionObserver):
(WebCore::ContextDestructionObserver::~ContextDestructionObserver):
(WebCore::ActiveDOMObject::ActiveDOMObject):
(WebCore::ActiveDOMObject::~ActiveDOMObject):
* storage/DatabaseSync.cpp:
(WebCore::DatabaseSync::openDatabaseSync):
(WebCore::DatabaseSync::~DatabaseSync):
(WebCore::DatabaseSync::changeVersion):
(WebCore::DatabaseSync::runTransaction):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (105803 => 105804)


--- trunk/Source/WebCore/ChangeLog	2012-01-24 21:43:43 UTC (rev 105803)
+++ trunk/Source/WebCore/ChangeLog	2012-01-24 22:04:14 UTC (rev 105804)
@@ -1,3 +1,23 @@
+2012-01-24  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r105238.
+        http://trac.webkit.org/changeset/105238
+        https://bugs.webkit.org/show_bug.cgi?id=76943
+
+        Remove the assert text hack as it served its purpose.
+        (Requested by dave_levin on #webkit).
+
+        * dom/ActiveDOMObject.cpp:
+        (WebCore::ContextDestructionObserver::ContextDestructionObserver):
+        (WebCore::ContextDestructionObserver::~ContextDestructionObserver):
+        (WebCore::ActiveDOMObject::ActiveDOMObject):
+        (WebCore::ActiveDOMObject::~ActiveDOMObject):
+        * storage/DatabaseSync.cpp:
+        (WebCore::DatabaseSync::openDatabaseSync):
+        (WebCore::DatabaseSync::~DatabaseSync):
+        (WebCore::DatabaseSync::changeVersion):
+        (WebCore::DatabaseSync::runTransaction):
+
 2012-01-24  Kentaro Hara  <[email protected]>
 
         [Refactoring] In CodeGeneratorGObject.pm, merge

Modified: trunk/Source/WebCore/dom/ActiveDOMObject.cpp (105803 => 105804)


--- trunk/Source/WebCore/dom/ActiveDOMObject.cpp	2012-01-24 21:43:43 UTC (rev 105803)
+++ trunk/Source/WebCore/dom/ActiveDOMObject.cpp	2012-01-24 22:04:14 UTC (rev 105804)
@@ -39,7 +39,7 @@
     if (!m_scriptExecutionContext)
         return;
 
-    ASSERT(m_scriptExecutionContext->isContextThread() && 1);
+    ASSERT(m_scriptExecutionContext->isContextThread());
     m_scriptExecutionContext->didCreateDestructionObserver(this);
 }
 
@@ -48,7 +48,7 @@
     if (!m_scriptExecutionContext)
         return;
 
-    ASSERT(m_scriptExecutionContext->isContextThread() && 2);
+    ASSERT(m_scriptExecutionContext->isContextThread());
     m_scriptExecutionContext->willDestroyDestructionObserver(this);
 }
 
@@ -64,7 +64,7 @@
     if (!m_scriptExecutionContext)
         return;
 
-    ASSERT(m_scriptExecutionContext->isContextThread() && 3);
+    ASSERT(m_scriptExecutionContext->isContextThread());
     m_scriptExecutionContext->didCreateActiveDOMObject(this, upcastPointer);
 }
 
@@ -73,7 +73,7 @@
     if (!m_scriptExecutionContext)
         return;
 
-    ASSERT(m_scriptExecutionContext->isContextThread() && 4);
+    ASSERT(m_scriptExecutionContext->isContextThread());
     m_scriptExecutionContext->willDestroyActiveDOMObject(this);
 }

Modified: trunk/Source/WebCore/storage/DatabaseSync.cpp (105803 => 105804)


--- trunk/Source/WebCore/storage/DatabaseSync.cpp	2012-01-24 21:43:43 UTC (rev 105803)
+++ trunk/Source/WebCore/storage/DatabaseSync.cpp	2012-01-24 22:04:14 UTC (rev 105804)
@@ -50,7 +50,7 @@
 PassRefPtr<DatabaseSync> DatabaseSync::openDatabaseSync(ScriptExecutionContext* context, const String& name, const String& expectedVersion, const String& displayName,
                                                         unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
 {
-    ASSERT(context->isContextThread() && 20);
+    ASSERT(context->isContextThread());
 
     if (!DatabaseTracker::tracker().canEstablishDatabase(context, name, displayName, estimatedSize)) {
         LOG(StorageAPI, "Database %s for origin %s not allowed to be established", name.ascii().data(), context->securityOrigin()->toString().ascii().data());
@@ -84,7 +84,7 @@
 
 DatabaseSync::~DatabaseSync()
 {
-    ASSERT(m_scriptExecutionContext->isContextThread() && 21);
+    ASSERT(m_scriptExecutionContext->isContextThread());
 
     if (opened()) {
         DatabaseTracker::tracker().removeOpenDatabase(this);
@@ -94,7 +94,7 @@
 
 void DatabaseSync::changeVersion(const String& oldVersion, const String& newVersion, PassRefPtr<SQLTransactionSyncCallback> changeVersionCallback, ExceptionCode& ec)
 {
-    ASSERT(m_scriptExecutionContext->isContextThread() && 22);
+    ASSERT(m_scriptExecutionContext->isContextThread());
 
     if (sqliteDatabase().transactionInProgress()) {
         reportChangeVersionResult(1, SQLException::DATABASE_ERR, 0);
@@ -160,7 +160,7 @@
 
 void DatabaseSync::runTransaction(PassRefPtr<SQLTransactionSyncCallback> callback, bool readOnly, ExceptionCode& ec)
 {
-    ASSERT(m_scriptExecutionContext->isContextThread() && 23);
+    ASSERT(m_scriptExecutionContext->isContextThread());
 
     if (sqliteDatabase().transactionInProgress()) {
         setLastErrorMessage("unable to start a transaction from within a transaction");

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to