diff options
| author | Steve Block <steveblock@google.com> | 2012-01-09 18:34:42 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-10 15:56:31 +0000 |
| commit | 6dd76b804786ec760bb04b137a6bf017064226dc (patch) | |
| tree | fe6715707f69e2588307e55c05c2f40e0363f9dc /Source/WebKit/android/jni/WebIconDatabase.cpp | |
| parent | 5568a9850c798bc4d30002485666c70c055e3457 (diff) | |
| download | external_webkit-6dd76b804786ec760bb04b137a6bf017064226dc.zip external_webkit-6dd76b804786ec760bb04b137a6bf017064226dc.tar.gz external_webkit-6dd76b804786ec760bb04b137a6bf017064226dc.tar.bz2 | |
Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE
See https://android-git.corp.google.com/g/157519
Bug: 5449033
Change-Id: Icaed25ccf4d689b533101e966e8303810b61b0d4
Diffstat (limited to 'Source/WebKit/android/jni/WebIconDatabase.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/WebIconDatabase.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit/android/jni/WebIconDatabase.cpp b/Source/WebKit/android/jni/WebIconDatabase.cpp index 4a2ea0a..3d988e9 100644 --- a/Source/WebKit/android/jni/WebIconDatabase.cpp +++ b/Source/WebKit/android/jni/WebIconDatabase.cpp @@ -168,7 +168,7 @@ static void Open(JNIEnv* env, jobject obj, jstring path) return; iconDb.setEnabled(true); iconDb.setClient(gIconDatabaseClient); - LOG_ASSERT(path, "No path given to nativeOpen"); + ALOG_ASSERT(path, "No path given to nativeOpen"); WTF::String pathStr = jstringToWtfString(env, path); WTF::CString fullPath = WebCore::pathByAppendingComponent(pathStr, WebCore::IconDatabase::defaultDatabaseFilename()).utf8(); @@ -206,7 +206,7 @@ static void RemoveAllIcons(JNIEnv* env, jobject obj) static jobject IconForPageUrl(JNIEnv* env, jobject obj, jstring url) { - LOG_ASSERT(url, "No url given to iconForPageUrl"); + ALOG_ASSERT(url, "No url given to iconForPageUrl"); WTF::String urlStr = jstringToWtfString(env, url); // FIXME: This method should not be used from outside WebCore and will be removed. @@ -218,7 +218,7 @@ static jobject IconForPageUrl(JNIEnv* env, jobject obj, jstring url) static void RetainIconForPageUrl(JNIEnv* env, jobject obj, jstring url) { - LOG_ASSERT(url, "No url given to retainIconForPageUrl"); + ALOG_ASSERT(url, "No url given to retainIconForPageUrl"); WTF::String urlStr = jstringToWtfString(env, url); ALOGV("Retaining icon for '%s'", urlStr.latin1().data()); @@ -227,7 +227,7 @@ static void RetainIconForPageUrl(JNIEnv* env, jobject obj, jstring url) static void ReleaseIconForPageUrl(JNIEnv* env, jobject obj, jstring url) { - LOG_ASSERT(url, "No url given to releaseIconForPageUrl"); + ALOG_ASSERT(url, "No url given to releaseIconForPageUrl"); WTF::String urlStr = jstringToWtfString(env, url); ALOGV("Releasing icon for '%s'", urlStr.latin1().data()); @@ -256,7 +256,7 @@ int registerWebIconDatabase(JNIEnv* env) { #ifndef NDEBUG jclass webIconDatabase = env->FindClass("android/webkit/WebIconDatabase"); - LOG_ASSERT(webIconDatabase, "Unable to find class android.webkit.WebIconDatabase"); + ALOG_ASSERT(webIconDatabase, "Unable to find class android.webkit.WebIconDatabase"); env->DeleteLocalRef(webIconDatabase); #endif |