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

5 files changed, 19 insertions, 19 deletions

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