Title: [103387] trunk/Source/WebCore
- Revision
- 103387
- Author
- le...@chromium.org
- Date
- 2011-12-20 19:26:26 -0800 (Tue, 20 Dec 2011)
Log Message
Move misplaced assert in SQLiteStatement.cpp
https://bugs.webkit.org/show_bug.cgi?id=74975
Reviewed by Dmitry Titov.
The test is coming with bug 74666.
* platform/sql/SQLiteStatement.cpp:
(WebCore::SQLiteStatement::step): If a database was interrupted
before the prepare method was called, then m_isPrepared will be
false, so I moved the assert to be after the check for interrupted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (103386 => 103387)
--- trunk/Source/WebCore/ChangeLog 2011-12-21 02:37:02 UTC (rev 103386)
+++ trunk/Source/WebCore/ChangeLog 2011-12-21 03:26:26 UTC (rev 103387)
@@ -1,3 +1,17 @@
+2011-12-20 David Levin <le...@chromium.org>
+
+ Move misplaced assert in SQLiteStatement.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=74975
+
+ Reviewed by Dmitry Titov.
+
+ The test is coming with bug 74666.
+
+ * platform/sql/SQLiteStatement.cpp:
+ (WebCore::SQLiteStatement::step): If a database was interrupted
+ before the prepare method was called, then m_isPrepared will be
+ false, so I moved the assert to be after the check for interrupted.
+
2011-12-20 Eric Carlson <eric.carl...@apple.com>
WebVTT cues sometimes render when they should not
Modified: trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp (103386 => 103387)
--- trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp 2011-12-21 02:37:02 UTC (rev 103386)
+++ trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp 2011-12-21 03:26:26 UTC (rev 103387)
@@ -94,11 +94,10 @@
int SQLiteStatement::step()
{
- ASSERT(m_isPrepared);
-
MutexLocker databaseLock(m_database.databaseMutex());
if (m_database.isInterrupted())
return SQLITE_INTERRUPT;
+ ASSERT(m_isPrepared);
if (!m_statement)
return SQLITE_OK;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
