Web SQL: Replace WTF_LOG() with STORAGE_DVLOG() or SQL_DVLOG().

third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteStatement.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/webdatabase/sqlite/SQLiteStatement.h"
 
+#include "modules/webdatabase/sqlite/SQLLog.h"
 #include "modules/webdatabase/sqlite/SQLValue.h"
-#include "platform/Logging.h"
 #include "platform/heap/SafePoint.h"
 #include "third_party/sqlite/sqlite3.h"
 #include "wtf/Assertions.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/text/CString.h"
 #include <memory>
 
 // SQLite 3.6.16 makes sqlite3_prepare_v2 automatically retry preparing the statement
 // once if the database scheme has changed. We rely on this behavior.
 #if SQLITE_VERSION_NUMBER < 3006016
@@ skipping 63 matching lines @@
     // Need to pass non-stack |const char*| and |sqlite3_stmt*| to avoid race
     // with Oilpan stack scanning.
     std::unique_ptr<const char*> tail = wrapUnique(new const char*);
     std::unique_ptr<sqlite3_stmt*> statement = wrapUnique(new sqlite3_stmt*);
     *tail = nullptr;
     *statement = nullptr;
     int error;
     {
         SafePointScope scope(BlinkGC::HeapPointersOnStack);
 
-        WTF_LOG(SQLDatabase, "SQL - prepare - %s", query.data());
+        SQL_DVLOG(1) << "SQL - prepare - " << query.data();
 
         // Pass the length of the string including the null character to sqlite3_prepare_v2;
         // this lets SQLite avoid an extra string copy.
         size_t lengthIncludingNullCharacter = query.length() + 1;
 
         error = sqlite3_prepare_v2(m_database.sqlite3Handle(), query.data(), lengthIncludingNullCharacter, statement.get(), tail.get());
     }
     m_statement = *statement;
 
     if (error != SQLITE_OK)
-        WTF_LOG(SQLDatabase, "sqlite3_prepare16 failed (%i)\n%s\n%s", error, query.data(), sqlite3_errmsg(m_database.sqlite3Handle()));
+        SQL_DVLOG(1) << "sqlite3_prepare16 failed (" << error << ")\n" << query.data() << "\n" << sqlite3_errmsg(m_database.sqlite3Handle());
     else if (*tail && **tail)
         error = SQLITE_ERROR;
 
 #if ENABLE(ASSERT)
     m_isPrepared = error == SQLITE_OK;
 #endif
     return restrictError(error);
 }
 
 int SQLiteStatement::step()
 {
     SafePointScope scope(BlinkGC::HeapPointersOnStack);
     //ASSERT(m_isPrepared);
 
     if (!m_statement)
         return SQLITE_OK;
 
     // The database needs to update its last changes count before each statement
     // in order to compute properly the lastChanges() return value.
     m_database.updateLastChangesCount();
 
-    WTF_LOG(SQLDatabase, "SQL - step - %s", m_query.ascii().data());
+    SQL_DVLOG(1) << "SQL - step - " << m_query;
     int error = sqlite3_step(m_statement);
     if (error != SQLITE_DONE && error != SQLITE_ROW) {
-        WTF_LOG(SQLDatabase, "sqlite3_step failed (%i)\nQuery - %s\nError - %s",
-            error, m_query.ascii().data(), sqlite3_errmsg(m_database.sqlite3Handle()));
+        SQL_DVLOG(1) << "sqlite3_step failed (" << error << " )\nQuery - "
+            << m_query << "\nError - " << sqlite3_errmsg(m_database.sqlite3Handle());
     }
 
     return restrictError(error);
 }
 
 int SQLiteStatement::finalize()
 {
 #if ENABLE(ASSERT)
     m_isPrepared = false;
 #endif
     if (!m_statement)
         return SQLITE_OK;
-    WTF_LOG(SQLDatabase, "SQL - finalize - %s", m_query.ascii().data());
+    SQL_DVLOG(1) << "SQL - finalize - " << m_query;
     int result = sqlite3_finalize(m_statement);
     m_statement = 0;
     return restrictError(result);
 }
 
 bool SQLiteStatement::executeCommand()
 {
     if (!m_statement && prepare() != SQLITE_OK)
         return false;
     ASSERT(m_isPrepared);
@@ skipping 135 matching lines @@
     ASSERT(col >= 0);
     if (!m_statement)
         if (prepareAndStep() != SQLITE_ROW)
             return 0;
     if (columnCount() <= col)
         return 0;
     return sqlite3_column_int64(m_statement, col);
 }
 
 } // namespace blink