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

5 files changed, 13 insertions, 13 deletions

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;
 }