Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I35a9fa5e53a83a9c9a920333a3752dd151fbd3b8

18 files changed, 79 insertions, 79 deletions

diff --git a/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp b/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp
index 048d787..5f60163 100644
--- a/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp
+++ b/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp
@@ -118,7 +118,7 @@ static bool loadArchiveResourceField(xmlNodePtr resourceNode, const xmlChar* fie
         }
     }
     if (!base64Data) {
-        LOGD("loadArchiveResourceField: Failed to load field.");
+        ALOGD("loadArchiveResourceField: Failed to load field.");
         return false;
     }
 
@@ -126,7 +126,7 @@ static bool loadArchiveResourceField(xmlNodePtr resourceNode, const xmlChar* fie
 
     const int result = base64Decode(base64Data, base64Size, *outputData);
     if (!result) {
-        LOGD("loadArchiveResourceField: Failed to decode field.");
+        ALOGD("loadArchiveResourceField: Failed to decode field.");
         return false;
     }
 
@@ -166,37 +166,37 @@ static KURL loadArchiveResourceFieldURL(xmlNodePtr resourceNode, const xmlChar*
 static PassRefPtr<ArchiveResource> loadArchiveResource(xmlNodePtr resourceNode)
 {
     if (!xmlStrEqual(resourceNode->name, archiveResourceTag)) {
-        LOGD("loadArchiveResource: Malformed resource.");
+        ALOGD("loadArchiveResource: Malformed resource.");
         return 0;
     }
 
     KURL url = loadArchiveResourceFieldURL(resourceNode, urlFieldTag);
     if (url.isNull()) {
-        LOGD("loadArchiveResource: Failed to load resource.");
+        ALOGD("loadArchiveResource: Failed to load resource.");
         return 0;
     }
 
     String mimeType = loadArchiveResourceFieldString(resourceNode, mimeFieldTag);
     if (mimeType.isNull()) {
-        LOGD("loadArchiveResource: Failed to load resource.");
+        ALOGD("loadArchiveResource: Failed to load resource.");
         return 0;
     }
 
     String textEncoding = loadArchiveResourceFieldString(resourceNode, encodingFieldTag);
     if (textEncoding.isNull()) {
-        LOGD("loadArchiveResource: Failed to load resource.");
+        ALOGD("loadArchiveResource: Failed to load resource.");
         return 0;
     }
 
     String frameName = loadArchiveResourceFieldString(resourceNode, frameFieldTag);
     if (frameName.isNull()) {
-        LOGD("loadArchiveResource: Failed to load resource.");
+        ALOGD("loadArchiveResource: Failed to load resource.");
         return 0;
     }
 
     PassRefPtr<SharedBuffer> data = loadArchiveResourceFieldBuffer(resourceNode, dataFieldTag);
     if (!data) {
-        LOGD("loadArchiveResource: Failed to load resource.");
+        ALOGD("loadArchiveResource: Failed to load resource.");
         return 0;
     }
 
@@ -212,7 +212,7 @@ static PassRefPtr<WebArchiveAndroid> loadArchive(xmlNodePtr archiveNode)
     Vector<PassRefPtr<Archive> > subframes;
 
     if (!xmlStrEqual(archiveNode->name, archiveTag)) {
-        LOGD("loadArchive: Malformed archive.");
+        ALOGD("loadArchive: Malformed archive.");
         return 0;
     }
 
@@ -228,7 +228,7 @@ static PassRefPtr<WebArchiveAndroid> loadArchive(xmlNodePtr archiveNode)
         }
     }
     if (!mainResource) {
-        LOGD("loadArchive: Failed to load main resource.");
+        ALOGD("loadArchive: Failed to load main resource.");
         return 0;
     }
 
@@ -241,7 +241,7 @@ static PassRefPtr<WebArchiveAndroid> loadArchive(xmlNodePtr archiveNode)
                  resourceNode = resourceNode->next) {
                 PassRefPtr<ArchiveResource> subresource = loadArchiveResource(resourceNode);
                 if (!subresource) {
-                    LOGD("loadArchive: Failed to load subresource.");
+                    ALOGD("loadArchive: Failed to load subresource.");
                     break;
                 }
                 subresources.append(subresource);
@@ -259,7 +259,7 @@ static PassRefPtr<WebArchiveAndroid> loadArchive(xmlNodePtr archiveNode)
                  resourceNode = resourceNode->next) {
                 PassRefPtr<WebArchiveAndroid> subframe = loadArchive(resourceNode);
                 if (!subframe) {
-                    LOGD("loadArchive: Failed to load subframe.");
+                    ALOGD("loadArchive: Failed to load subframe.");
                     break;
                 }
                 subframes.append(subframe);
@@ -291,20 +291,20 @@ PassRefPtr<WebArchiveAndroid> WebArchiveAndroid::create(SharedBuffer* buffer)
 
     xmlDocPtr doc = xmlReadMemory(buffer->data(), buffer->size(), noBaseUrl, defaultEncoding, noParserOptions);
     if (!doc) {
-        LOGD("create: Failed to parse document.");
+        ALOGD("create: Failed to parse document.");
         return createArchiveForError();
     }
 
     xmlNodePtr root = xmlDocGetRootElement(doc);
     if (!root) {
-        LOGD("create: Empty document.");
+        ALOGD("create: Empty document.");
         xmlFreeDoc(doc);
         return createArchiveForError();
     }
 
     RefPtr<WebArchiveAndroid> archive = loadArchive(root);
     if (!archive) {
-        LOGD("create: Failed to load archive.");
+        ALOGD("create: Failed to load archive.");
         xmlFreeDoc(doc);
         return createArchiveForError();
     }
@@ -317,7 +317,7 @@ static bool saveArchiveResourceField(xmlTextWriterPtr writer, const xmlChar* tag
 {
     int result = xmlTextWriterStartElement(writer, tag);
     if (result < 0) {
-        LOGD("saveArchiveResourceField: Failed to start element.");
+        ALOGD("saveArchiveResourceField: Failed to start element.");
         return false;
     }
 
@@ -325,20 +325,20 @@ static bool saveArchiveResourceField(xmlTextWriterPtr writer, const xmlChar* tag
         Vector<char> base64Data;
         base64Encode(data, size, base64Data, false);
         if (base64Data.isEmpty()) {
-            LOGD("saveArchiveResourceField: Failed to base64 encode data.");
+            ALOGD("saveArchiveResourceField: Failed to base64 encode data.");
             return false;
         }
 
         result = xmlTextWriterWriteRawLen(writer, BAD_CAST base64Data.data(), base64Data.size());
         if (result < 0) {
-            LOGD("saveArchiveResourceField: Failed to write data.");
+            ALOGD("saveArchiveResourceField: Failed to write data.");
             return false;
         }
     }
 
     result = xmlTextWriterEndElement(writer);
     if (result < 0) {
-        LOGD("saveArchiveResourceField: Failed to end element.");
+        ALOGD("saveArchiveResourceField: Failed to end element.");
         return false;
     }
 
@@ -361,7 +361,7 @@ static bool saveArchiveResource(xmlTextWriterPtr writer, PassRefPtr<ArchiveResou
 {
     int result = xmlTextWriterStartElement(writer, archiveResourceTag);
     if (result < 0) {
-        LOGD("saveArchiveResource: Failed to start element.");
+        ALOGD("saveArchiveResource: Failed to start element.");
         return false;
     }
 
@@ -374,7 +374,7 @@ static bool saveArchiveResource(xmlTextWriterPtr writer, PassRefPtr<ArchiveResou
 
     result = xmlTextWriterEndElement(writer);
     if (result < 0) {
-        LOGD("saveArchiveResource: Failed to end element.");
+        ALOGD("saveArchiveResource: Failed to end element.");
         return false;
     }
 
@@ -385,13 +385,13 @@ static bool saveArchive(xmlTextWriterPtr writer, PassRefPtr<Archive> archive)
 {
     int result = xmlTextWriterStartElement(writer, archiveTag);
     if (result < 0) {
-        LOGD("saveArchive: Failed to start element.");
+        ALOGD("saveArchive: Failed to start element.");
         return false;
     }
 
     result = xmlTextWriterStartElement(writer, mainResourceTag);
     if (result < 0) {
-        LOGD("saveArchive: Failed to start element.");
+        ALOGD("saveArchive: Failed to start element.");
         return false;
     }
 
@@ -400,13 +400,13 @@ static bool saveArchive(xmlTextWriterPtr writer, PassRefPtr<Archive> archive)
 
     result = xmlTextWriterEndElement(writer);
     if (result < 0) {
-        LOGD("saveArchive: Failed to end element.");
+        ALOGD("saveArchive: Failed to end element.");
         return false;
     }
 
     result = xmlTextWriterStartElement(writer, subresourcesTag);
     if (result < 0) {
-        LOGD("saveArchive: Failed to start element.");
+        ALOGD("saveArchive: Failed to start element.");
         return false;
     }
 
@@ -419,13 +419,13 @@ static bool saveArchive(xmlTextWriterPtr writer, PassRefPtr<Archive> archive)
 
     result = xmlTextWriterEndElement(writer);
     if (result < 0) {
-        LOGD("saveArchive: Failed to end element.");
+        ALOGD("saveArchive: Failed to end element.");
         return false;
     }
 
     result = xmlTextWriterStartElement(writer, subframesTag);
     if (result < 0) {
-        LOGD("saveArchive: Failed to start element.");
+        ALOGD("saveArchive: Failed to start element.");
         return false;
     }
 
@@ -438,7 +438,7 @@ static bool saveArchive(xmlTextWriterPtr writer, PassRefPtr<Archive> archive)
 
     result = xmlTextWriterEndElement(writer);
     if (result < 0) {
-        LOGD("saveArchive: Failed to end element.");
+        ALOGD("saveArchive: Failed to end element.");
         return true;
     }
 
@@ -453,7 +453,7 @@ bool WebArchiveAndroid::saveWebArchive(xmlTextWriterPtr writer)
 
     int result = xmlTextWriterStartDocument(writer, defaultXmlVersion, defaultEncoding, defaultStandalone);
     if (result < 0) {
-        LOGD("saveWebArchive: Failed to start document.");
+        ALOGD("saveWebArchive: Failed to start document.");
         return false;
     }
 
@@ -462,7 +462,7 @@ bool WebArchiveAndroid::saveWebArchive(xmlTextWriterPtr writer)
 
     result = xmlTextWriterEndDocument(writer);
     if (result< 0) {
-        LOGD("saveWebArchive: Failed to end document.");
+        ALOGD("saveWebArchive: Failed to end document.");
         return false;
     }
 
diff --git a/Source/WebKit/android/AndroidLog.h b/Source/WebKit/android/AndroidLog.h
index 8f54c02..4090ab9 100644
--- a/Source/WebKit/android/AndroidLog.h
+++ b/Source/WebKit/android/AndroidLog.h
@@ -32,12 +32,12 @@
 extern FILE* gDomTreeFile;
 #define DOM_TREE_LOG_FILE "/sdcard/domTree.txt"
 #define DUMP_DOM_LOGD(...) { if (gDomTreeFile) \
-    fprintf(gDomTreeFile, __VA_ARGS__); else LOGD(__VA_ARGS__); }
+    fprintf(gDomTreeFile, __VA_ARGS__); else ALOGD(__VA_ARGS__); }
 
 extern FILE* gRenderTreeFile;
 #define RENDER_TREE_LOG_FILE "/sdcard/renderTree.txt"
 #define DUMP_RENDER_LOGD(...) { if (gRenderTreeFile) \
-    fprintf(gRenderTreeFile, __VA_ARGS__); else LOGD(__VA_ARGS__); }
+    fprintf(gRenderTreeFile, __VA_ARGS__); else ALOGD(__VA_ARGS__); }
 #else
 #define DUMP_DOM_LOGD(...) ((void)0)
 #define DUMP_RENDER_LOGD(...) ((void)0)
diff --git a/Source/WebKit/android/RenderSkinAndroid.cpp b/Source/WebKit/android/RenderSkinAndroid.cpp
index 4a9ce68..e6fb67b 100644
--- a/Source/WebKit/android/RenderSkinAndroid.cpp
+++ b/Source/WebKit/android/RenderSkinAndroid.cpp
@@ -65,14 +65,14 @@ bool RenderSkinAndroid::DecodeBitmap(android::AssetManager* am, const char* file
     if (!asset) {
         asset = am->openNonAsset(fileName, android::Asset::ACCESS_BUFFER);
         if (!asset) {
-            LOGD("RenderSkinAndroid: File \"%s\" not found.\n", fileName);
+            ALOGD("RenderSkinAndroid: File \"%s\" not found.\n", fileName);
             return false;
         }
     }
     
     bool success = SkImageDecoder::DecodeMemory(asset->getBuffer(false), asset->getLength(), bitmap);
     if (!success) {
-        LOGD("RenderSkinAndroid: Failed to decode %s\n", fileName);
+        ALOGD("RenderSkinAndroid: Failed to decode %s\n", fileName);
     }
 
     delete asset;
diff --git a/Source/WebKit/android/RenderSkinMediaButton.cpp b/Source/WebKit/android/RenderSkinMediaButton.cpp
index b92336e..f99c731 100644
--- a/Source/WebKit/android/RenderSkinMediaButton.cpp
+++ b/Source/WebKit/android/RenderSkinMediaButton.cpp
@@ -82,7 +82,7 @@ void RenderSkinMediaButton::Decode()
         String path = drawableDirectory + gFiles[i].name;
         if (!RenderSkinAndroid::DecodeBitmap(am, path.utf8().data(), &gButton[i])) {
             gDecodingFailed = true;
-            LOGD("RenderSkinButton::Init: button assets failed to decode\n\tBrowser buttons will not draw");
+            ALOGD("RenderSkinButton::Init: button assets failed to decode\n\tBrowser buttons will not draw");
             break;
         }
     }
diff --git a/Source/WebKit/android/benchmark/Intercept.cpp b/Source/WebKit/android/benchmark/Intercept.cpp
index deffac2..28ada5a 100644
--- a/Source/WebKit/android/benchmark/Intercept.cpp
+++ b/Source/WebKit/android/benchmark/Intercept.cpp
@@ -57,7 +57,7 @@ void MyResourceLoader::handleRequest()
 
 void MyResourceLoader::loadData(const String& data)
 {
-    LOGD("Loading data (%s) ...", data.latin1().data());
+    ALOGD("Loading data (%s) ...", data.latin1().data());
     ResourceHandleClient* client = m_handle->client();
     int index = data.find(',');
     if (index == -1) {
@@ -141,7 +141,7 @@ static String mimeTypeForExtension(const String& file)
 
 void MyResourceLoader::loadFile(const String& file)
 {
-    LOGD("Loading file (%s) ...", file.latin1().data());
+    ALOGD("Loading file (%s) ...", file.latin1().data());
     FILE* f = fopen(file.latin1().data(), "r");
     ResourceHandleClient* client = m_handle->client();
     if (!f) {
@@ -178,7 +178,7 @@ PassRefPtr<WebCore::ResourceLoaderAndroid> MyWebFrame::startLoadingResource(
 
 void MyWebFrame::timerFired(Timer<MyWebFrame>*)
 {
-    LOGD("Handling requests...");
+    ALOGD("Handling requests...");
     Vector<RefPtr<WebCore::ResourceLoaderAndroid> > reqs;
     reqs.swap(m_requests);
     Vector<RefPtr<WebCore::ResourceLoaderAndroid> >::iterator i = reqs.begin();
@@ -186,5 +186,5 @@ void MyWebFrame::timerFired(Timer<MyWebFrame>*)
     for (; i != end; i++)
         static_cast<MyResourceLoader*>((*i).get())->handleRequest();
 
-    LOGD("...done");
+    ALOGD("...done");
 }
diff --git a/Source/WebKit/android/benchmark/main.cpp b/Source/WebKit/android/benchmark/main.cpp
index fcb797d..df6db86 100644
--- a/Source/WebKit/android/benchmark/main.cpp
+++ b/Source/WebKit/android/benchmark/main.cpp
@@ -47,13 +47,13 @@ int main(int argc, char** argv) {
             if (x) {
                 width = atoi(optarg);
                 height = atoi(x + 1);
-                LOGD("Rendering page at %dx%d", width, height);
+                ALOGD("Rendering page at %dx%d", width, height);
             }
         } else if (c == 'r') {
             reloadCount = atoi(optarg);
             if (reloadCount < 0)
                 reloadCount = 0;
-            LOGD("Reloading %d times", reloadCount);
+            ALOGD("Reloading %d times", reloadCount);
         }
     }
     if (optind >= argc) {
diff --git a/Source/WebKit/android/jni/PictureSet.cpp b/Source/WebKit/android/jni/PictureSet.cpp
index 1bd72bd..1d50074 100644
--- a/Source/WebKit/android/jni/PictureSet.cpp
+++ b/Source/WebKit/android/jni/PictureSet.cpp
@@ -850,7 +850,7 @@ void PictureSet::dump(const char* label) const
         MeasureStream measure;
         if (working->mPicture != NULL)
             working->mPicture->serialize(&measure);
-        LOGD(" [%d]"
+        ALOGD(" [%d]"
             " mArea.bounds={%d,%d,r=%d,b=%d}"
             " mPicture=%p"
             " mUnsplit={%d,%d,r=%d,b=%d}"
@@ -1199,24 +1199,24 @@ bool PictureSet::validate(const char* funct) const
         const SkIRect& bounds = area.getBounds();
         bool localValid = false;
         if (working->mUnsplit.isEmpty())
-            LOGD("%s working->mUnsplit.isEmpty()", funct);
+            ALOGD("%s working->mUnsplit.isEmpty()", funct);
         else if (working->mUnsplit.contains(bounds) == false)
-            LOGD("%s working->mUnsplit.contains(bounds) == false", funct);
+            ALOGD("%s working->mUnsplit.contains(bounds) == false", funct);
         else if (working->mElapsed >= 1000)
-            LOGD("%s working->mElapsed >= 1000", funct);
+            ALOGD("%s working->mElapsed >= 1000", funct);
         else if ((working->mSplit & 0xfe) != 0)
-            LOGD("%s (working->mSplit & 0xfe) != 0", funct);
+            ALOGD("%s (working->mSplit & 0xfe) != 0", funct);
         else if ((working->mWroteElapsed & 0xfe) != 0)
-            LOGD("%s (working->mWroteElapsed & 0xfe) != 0", funct);
+            ALOGD("%s (working->mWroteElapsed & 0xfe) != 0", funct);
         else if (pict != NULL) {
             int pictWidth = pict->width();
             int pictHeight = pict->height();
             if (pictWidth < bounds.width())
-                LOGD("%s pictWidth=%d < bounds.width()=%d", funct, pictWidth, bounds.width());
+                ALOGD("%s pictWidth=%d < bounds.width()=%d", funct, pictWidth, bounds.width());
             else if (pictHeight < bounds.height())
-                LOGD("%s pictHeight=%d < bounds.height()=%d", funct, pictHeight, bounds.height());
+                ALOGD("%s pictHeight=%d < bounds.height()=%d", funct, pictHeight, bounds.height());
             else if (working->mArea.isEmpty())
-                LOGD("%s working->mArea.isEmpty()", funct);
+                ALOGD("%s working->mArea.isEmpty()", funct);
             else
                 localValid = true;
         } else
@@ -1224,7 +1224,7 @@ bool PictureSet::validate(const char* funct) const
         working->mArea.validate();
         if (localValid == false) {
             if (all.contains(area) == true)
-                LOGD("%s all.contains(area) == true", funct);
+                ALOGD("%s all.contains(area) == true", funct);
             else
                 localValid = true;
         }
@@ -1235,9 +1235,9 @@ bool PictureSet::validate(const char* funct) const
     if (valid) {
         valid = false;
         if (allBounds.width() != mWidth)
-            LOGD("%s allBounds.width()=%d != mWidth=%d", funct, allBounds.width(), mWidth);
+            ALOGD("%s allBounds.width()=%d != mWidth=%d", funct, allBounds.width(), mWidth);
         else if (allBounds.height() != mHeight)
-            LOGD("%s allBounds.height()=%d != mHeight=%d", funct, allBounds.height(), mHeight);
+            ALOGD("%s allBounds.height()=%d != mHeight=%d", funct, allBounds.height(), mHeight);
         else
             valid = true;
     }
diff --git a/Source/WebKit/android/jni/PictureSet.h b/Source/WebKit/android/jni/PictureSet.h
index fe47361..97d91e0 100644
--- a/Source/WebKit/android/jni/PictureSet.h
+++ b/Source/WebKit/android/jni/PictureSet.h
@@ -31,9 +31,9 @@
 #define PICTURE_SET_VALIDATE 0
 
 #if PICTURE_SET_DEBUG
-#define DBG_SET_LOG(message) LOGD("%s %s", __FUNCTION__, message)
-#define DBG_SET_LOGD(format, ...) LOGD("%s " format, __FUNCTION__, __VA_ARGS__)
-#define DEBUG_SET_UI_LOGD(...) LOGD(__VA_ARGS__)
+#define DBG_SET_LOG(message) ALOGD("%s %s", __FUNCTION__, message)
+#define DBG_SET_LOGD(format, ...) ALOGD("%s " format, __FUNCTION__, __VA_ARGS__)
+#define DEBUG_SET_UI_LOGD(...) ALOGD(__VA_ARGS__)
 #else
 #define DBG_SET_LOG(message) ((void)0)
 #define DBG_SET_LOGD(format, ...) ((void)0)
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
index 79494e6..20147e9 100644
--- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1484,7 +1484,7 @@ static jstring SaveWebArchive(JNIEnv *env, jobject obj, jstring basename, jboole
     }
 
     if (filename.isNull() || filename.isEmpty()) {
-        LOGD("saveWebArchive: Failed to select a filename to save.");
+        ALOGD("saveWebArchive: Failed to select a filename to save.");
         releaseCharactersForJStringInEnv(env, basename, basenameNative);
         return NULL;
     }
@@ -1492,7 +1492,7 @@ static jstring SaveWebArchive(JNIEnv *env, jobject obj, jstring basename, jboole
     const int noCompression = 0;
     xmlTextWriterPtr writer = xmlNewTextWriterFilename(filename.utf8().data(), noCompression);
     if (writer == NULL) {
-        LOGD("saveWebArchive: Failed to initialize xml writer.");
+        ALOGD("saveWebArchive: Failed to initialize xml writer.");
         releaseCharactersForJStringInEnv(env, basename, basenameNative);
         return NULL;
     }
diff --git a/Source/WebKit/android/jni/WebHistory.cpp b/Source/WebKit/android/jni/WebHistory.cpp
index c61d3ee..3b7c7a5 100644
--- a/Source/WebKit/android/jni/WebHistory.cpp
+++ b/Source/WebKit/android/jni/WebHistory.cpp
@@ -711,7 +711,7 @@ static bool read_item_recursive(WebCore::HistoryItem* newItem,
 #ifdef UNIT_TEST
 static void unit_test()
 {
-    LOGD("Entering history unit test!");
+    ALOGD("Entering history unit test!");
     const char* test1 = new char[0];
     WTF::RefPtr<WebCore::HistoryItem> item = WebCore::HistoryItem::create();
     WebCore::HistoryItem* testItem = item.get();
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index f8791f5..6f95072 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -983,7 +983,7 @@ void WebViewCore::scrollTo(int x, int y, bool animate)
 {
     LOG_ASSERT(m_javaGlue->m_obj, "A Java widget was not associated with this view bridge!");
 
-//    LOGD("WebViewCore::scrollTo(%d %d)\n", x, y);
+//    ALOGD("WebViewCore::scrollTo(%d %d)\n", x, y);
 
     JNIEnv* env = JSC::Bindings::getJNIEnv();
     AutoJObject javaObject = m_javaGlue->object(env);
diff --git a/Source/WebKit/android/nav/CachedDebug.h b/Source/WebKit/android/nav/CachedDebug.h
index f77c07a..c78254e 100644
--- a/Source/WebKit/android/nav/CachedDebug.h
+++ b/Source/WebKit/android/nav/CachedDebug.h
@@ -31,9 +31,9 @@
 #define DEBUG_NAV_UI_VERBOSE 0
 
 #if DEBUG_NAV_UI
-#define DBG_NAV_LOG(message) LOGD("%s %s", __FUNCTION__, message)
-#define DBG_NAV_LOGD(format, ...) LOGD("%s " format, __FUNCTION__, __VA_ARGS__)
-#define DEBUG_NAV_UI_LOGD(...) LOGD(__VA_ARGS__)
+#define DBG_NAV_LOG(message) ALOGD("%s %s", __FUNCTION__, message)
+#define DBG_NAV_LOGD(format, ...) ALOGD("%s " format, __FUNCTION__, __VA_ARGS__)
+#define DEBUG_NAV_UI_LOGD(...) ALOGD(__VA_ARGS__)
 #else
 #define DBG_NAV_LOG(message) ((void)0)
 #define DBG_NAV_LOGD(format, ...) ((void)0)
@@ -41,7 +41,7 @@
 #endif
 
 #if DEBUG_NAV_UI_VERBOSE
-#define DBG_NAV_LOGV(format, ...) LOGD("%s " format, __FUNCTION__, __VA_ARGS__)
+#define DBG_NAV_LOGV(format, ...) ALOGD("%s " format, __FUNCTION__, __VA_ARGS__)
 #else
 #define DBG_NAV_LOGV(format, ...) ((void)0)
 #endif
@@ -56,13 +56,13 @@
 extern FILE* gNavCacheLogFile;
 #define NAV_CACHE_LOG_FILE "/data/data/com.android.browser/navlog"
 #define DUMP_NAV_LOGD(...) do { if (gNavCacheLogFile) \
-    fprintf(gNavCacheLogFile, __VA_ARGS__); else LOGD(__VA_ARGS__); } while (false)
+    fprintf(gNavCacheLogFile, __VA_ARGS__); else ALOGD(__VA_ARGS__); } while (false)
 #define DUMP_NAV_LOGX(format, ...) do { if (gNavCacheLogFile) \
     fprintf(gNavCacheLogFile, format, __VA_ARGS__); \
-    else LOGD("%s " format, __FUNCTION__, __VA_ARGS__); } while (false)
+    else ALOGD("%s " format, __FUNCTION__, __VA_ARGS__); } while (false)
 #else
-#define DUMP_NAV_LOGD(...) LOGD(__VA_ARGS__)
-#define DUMP_NAV_LOGX(format, ...) LOGD("%s " format, __FUNCTION__, __VA_ARGS__)
+#define DUMP_NAV_LOGD(...) ALOGD(__VA_ARGS__)
+#define DUMP_NAV_LOGX(format, ...) ALOGD("%s " format, __FUNCTION__, __VA_ARGS__)
 #endif
 #else
 #define DUMP_NAV_LOGD(...) ((void)0)
diff --git a/Source/WebKit/android/nav/CachedNode.cpp b/Source/WebKit/android/nav/CachedNode.cpp
index e500875..e291504 100644
--- a/Source/WebKit/android/nav/CachedNode.cpp
+++ b/Source/WebKit/android/nav/CachedNode.cpp
@@ -132,7 +132,7 @@ void CachedNode::fixUpCursorRects(const CachedFrame* frame)
         WebCore::IntRect* boundsPtr = mCursorRing.begin() - 1;
         const WebCore::IntRect* const boundsEnd = mCursorRing.begin() + mCursorRing.size();
         while (++boundsPtr < boundsEnd)
-            LOGD("%s %d:(%d, %d, %d, %d)\n", __FUNCTION__, boundsPtr - mCursorRing.begin(),
+            ALOGD("%s %d:(%d, %d, %d, %d)\n", __FUNCTION__, boundsPtr - mCursorRing.begin(),
                 boundsPtr->x(), boundsPtr->y(), boundsPtr->width(), boundsPtr->height());
     }
 #endif
@@ -205,7 +205,7 @@ void CachedNode::fixUpCursorRects(const CachedFrame* frame)
                     candidateRight - candidateLeft, candidateBottom - candidateTop);
                  ASSERT(candidate.isEmpty() == false);
 #if DEBUG_NAV_UI
-                LOGD("%s %d:(%d, %d, %d, %d)\n", __FUNCTION__, mCursorRing.size(),
+                ALOGD("%s %d:(%d, %d, %d, %d)\n", __FUNCTION__, mCursorRing.size(),
                     candidate.x(), candidate.y(), candidate.width(), candidate.height());
 #endif
                 mCursorRing.append(candidate);
diff --git a/Source/WebKit/android/nav/FindCanvas.cpp b/Source/WebKit/android/nav/FindCanvas.cpp
index ca3cfba..1ae4f9b 100644
--- a/Source/WebKit/android/nav/FindCanvas.cpp
+++ b/Source/WebKit/android/nav/FindCanvas.cpp
@@ -495,7 +495,7 @@ void FindCanvas::insertMatchInfo(const SkRegion& region) {
     mWorkingPicture->endRecording();
     MatchInfo matchInfo;
     mMatches->append(matchInfo);
-    LOGD("%s region=%p pict=%p layer=%d", __FUNCTION__,
+    ALOGD("%s region=%p pict=%p layer=%d", __FUNCTION__,
         &region, mWorkingPicture, mLayerId);
     mMatches->last().set(region, mWorkingPicture, mLayerId);
 }
diff --git a/Source/WebKit/android/nav/SelectText.cpp b/Source/WebKit/android/nav/SelectText.cpp
index d20c44a..2035fbb 100644
--- a/Source/WebKit/android/nav/SelectText.cpp
+++ b/Source/WebKit/android/nav/SelectText.cpp
@@ -52,7 +52,7 @@
 // #define EXTRA_NOISY_LOGGING 1
 #define DEBUG_TOUCH_HANDLES 0
 #if DEBUG_TOUCH_HANDLES
-#define DBG_HANDLE_LOG(format, ...) LOGD("%s " format, __FUNCTION__, __VA_ARGS__)
+#define DBG_HANDLE_LOG(format, ...) ALOGD("%s " format, __FUNCTION__, __VA_ARGS__)
 #else
 #define DBG_HANDLE_LOG(...)
 #endif
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 7861205..70b7e6e 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -2373,7 +2373,7 @@ static jint nativeGetBlockLeftEdge(JNIEnv *env, jobject obj, jint x, jint y,
 static void nativeDestroy(JNIEnv *env, jobject obj)
 {
     WebView* view = GET_NATIVE_VIEW(env, obj);
-    LOGD("nativeDestroy view: %p", view);
+    ALOGD("nativeDestroy view: %p", view);
     LOG_ASSERT(view, "view not set in nativeDestroy");
     delete view;
 }
diff --git a/Source/WebKit/android/wds/Command.cpp b/Source/WebKit/android/wds/Command.cpp
index bd8536f..1a365e5 100644
--- a/Source/WebKit/android/wds/Command.cpp
+++ b/Source/WebKit/android/wds/Command.cpp
@@ -95,7 +95,7 @@ public:
     virtual ~InternalCommand() { delete m_connection; }
 
     void doCommand() const {
-        LOGD("Executing command '%s' (%s)", m_name, m_description);
+        ALOGD("Executing command '%s' (%s)", m_name, m_description);
         if (!m_dispatch(m_frame, m_connection))
             // XXX: Have useful failure messages
             m_connection->write("EPIC FAIL!\n", 11);
diff --git a/Source/WebKit/android/wds/DebugServer.cpp b/Source/WebKit/android/wds/DebugServer.cpp
index f33a65b..494a634 100644
--- a/Source/WebKit/android/wds/DebugServer.cpp
+++ b/Source/WebKit/android/wds/DebugServer.cpp
@@ -70,7 +70,7 @@ DebugServer::DebugServer() {
     char buf[PROPERTY_VALUE_MAX];
     int ret = property_get("webcore.wds.enable", buf, NULL);
     if (ret != -1 && strcmp(buf, "1") == 0) {
-        LOGD("WDS Enabled");
+        ALOGD("WDS Enabled");
         m_threadId = createThread(mainThread, this, "WDS");
     }
     // Initialize the available commands.
@@ -78,7 +78,7 @@ DebugServer::DebugServer() {
 }
 
 void DebugServer::start() {
-    LOGD("DebugServer thread started");
+    ALOGD("DebugServer thread started");
 
     ConnectionServer cs;
     if (!cs.connect(DEFAULT_PORT)) {
@@ -87,13 +87,13 @@ void DebugServer::start() {
     }
 
     while (true ) {
-        LOGD("Waiting for incoming connections...");
+        ALOGD("Waiting for incoming connections...");
         Connection* conn = cs.accept();
         if (!conn) {
             log_errno("Failed to accept new connections");
             return;
         }
-        LOGD("...Connection established");
+        ALOGD("...Connection established");
 
         Command* c = Command::Find(conn);
         if (!c) {
@@ -106,7 +106,7 @@ void DebugServer::start() {
         }
     }
 
-    LOGD("DebugServer thread finished");
+    ALOGD("DebugServer thread finished");
 }
 
 } // end namespace WDS