1 files changed, 12 insertions, 12 deletions

diff --git a/Source/WebKit/android/jni/WebCoreResourceLoader.cpp b/Source/WebKit/android/jni/WebCoreResourceLoader.cpp
index 3aa4422..f0861ff 100644
--- a/Source/WebKit/android/jni/WebCoreResourceLoader.cpp
+++ b/Source/WebKit/android/jni/WebCoreResourceLoader.cpp
@@ -131,9 +131,9 @@ bool WebCoreResourceLoader::willLoadFromCache(const WebCore::KURL& url, int64_t
 void WebCoreResourceLoader::SetResponseHeader(JNIEnv* env, jobject obj, jint nativeResponse, jstring key, jstring val)
 {
     WebCore::ResourceResponse* response = (WebCore::ResourceResponse*)nativeResponse;
-    LOG_ASSERT(response, "nativeSetResponseHeader must take a valid response pointer!");
+    ALOG_ASSERT(response, "nativeSetResponseHeader must take a valid response pointer!");
 
-    LOG_ASSERT(key, "How did a null value become a key?");
+    ALOG_ASSERT(key, "How did a null value become a key?");
     if (val)
         response->setHTTPHeaderField(jstringToWtfString(env, key), jstringToWtfString(env, val));
 }
@@ -142,7 +142,7 @@ jint WebCoreResourceLoader::CreateResponse(JNIEnv* env, jobject obj, jstring url
                                                     jstring statusText, jstring mimeType, jlong expectedLength,
                                                     jstring encoding)
 {
-    LOG_ASSERT(url, "Must have a url in the response!");
+    ALOG_ASSERT(url, "Must have a url in the response!");
     WebCore::KURL kurl(WebCore::ParsedURLString, jstringToWtfString(env, url));
     WTF::String encodingStr;
     WTF::String mimeTypeStr;
@@ -169,13 +169,13 @@ jint WebCoreResourceLoader::CreateResponse(JNIEnv* env, jobject obj, jstring url
 void WebCoreResourceLoader::ReceivedResponse(JNIEnv* env, jobject obj, jint nativeResponse)
 {
     WebCore::ResourceHandle* handle = GET_NATIVE_HANDLE(env, obj);
-    LOG_ASSERT(handle, "nativeReceivedResponse must take a valid handle!");
+    ALOG_ASSERT(handle, "nativeReceivedResponse must take a valid handle!");
     // ResourceLoader::didFail() can set handle to be NULL, we need to check
     if (!handle)
         return;
 
     WebCore::ResourceResponse* response = (WebCore::ResourceResponse*)nativeResponse;
-    LOG_ASSERT(response, "nativeReceivedResponse must take a valid resource pointer!");
+    ALOG_ASSERT(response, "nativeReceivedResponse must take a valid resource pointer!");
     handle->client()->didReceiveResponse(handle, *response);
     // As the client makes a copy of the response, delete it here.
     delete response;
@@ -186,7 +186,7 @@ void WebCoreResourceLoader::AddData(JNIEnv* env, jobject obj, jbyteArray dataArr
     ALOGV("webcore_resourceloader data(%d)", length);
 
     WebCore::ResourceHandle* handle = GET_NATIVE_HANDLE(env, obj);
-    LOG_ASSERT(handle, "nativeAddData must take a valid handle!");
+    ALOG_ASSERT(handle, "nativeAddData must take a valid handle!");
     // ResourceLoader::didFail() can set handle to be NULL, we need to check
     if (!handle)
         return;
@@ -196,7 +196,7 @@ void WebCoreResourceLoader::AddData(JNIEnv* env, jobject obj, jbyteArray dataArr
     bool result = false;
     jbyte * data =  env->GetByteArrayElements(dataArray, NULL);
 
-    LOG_ASSERT(handle->client(), "Why do we not have a client?");
+    ALOG_ASSERT(handle->client(), "Why do we not have a client?");
     handle->client()->didReceiveData(handle, (const char *)data, length, length);
     env->ReleaseByteArrayElements(dataArray, data, JNI_ABORT);    
 }
@@ -205,12 +205,12 @@ void WebCoreResourceLoader::Finished(JNIEnv* env, jobject obj)
 {
     ALOGV("webcore_resourceloader finished");
     WebCore::ResourceHandle* handle = GET_NATIVE_HANDLE(env, obj);
-    LOG_ASSERT(handle, "nativeFinished must take a valid handle!");
+    ALOG_ASSERT(handle, "nativeFinished must take a valid handle!");
     // ResourceLoader::didFail() can set handle to be NULL, we need to check
     if (!handle)
         return;
 
-    LOG_ASSERT(handle->client(), "Why do we not have a client?");
+    ALOG_ASSERT(handle->client(), "Why do we not have a client?");
     handle->client()->didFinishLoading(handle, 0);
 }
 
@@ -219,12 +219,12 @@ jstring WebCoreResourceLoader::RedirectedToUrl(JNIEnv* env, jobject obj,
 {
     ALOGV("webcore_resourceloader redirectedToUrl");
     WebCore::ResourceHandle* handle = GET_NATIVE_HANDLE(env, obj);
-    LOG_ASSERT(handle, "nativeRedirectedToUrl must take a valid handle!");
+    ALOG_ASSERT(handle, "nativeRedirectedToUrl must take a valid handle!");
     // ResourceLoader::didFail() can set handle to be NULL, we need to check
     if (!handle)
         return NULL;
 
-    LOG_ASSERT(handle->client(), "Why do we not have a client?");
+    ALOG_ASSERT(handle->client(), "Why do we not have a client?");
     WebCore::ResourceRequest r = handle->firstRequest();
     WebCore::KURL url(WebCore::KURL(WebCore::ParsedURLString, jstringToWtfString(env, baseUrl)),
             jstringToWtfString(env, redirectTo));
@@ -255,7 +255,7 @@ void WebCoreResourceLoader::Error(JNIEnv* env, jobject obj, jint id, jstring des
 {
     ALOGV("webcore_resourceloader error");
     WebCore::ResourceHandle* handle = GET_NATIVE_HANDLE(env, obj);
-    LOG_ASSERT(handle, "nativeError must take a valid handle!");
+    ALOG_ASSERT(handle, "nativeError must take a valid handle!");
     // ResourceLoader::didFail() can set handle to be NULL, we need to check
     if (!handle)
         return;