Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: I4de9cd9a3bc462c4aead1fbcd4ac0f426556bc59

14 files changed, 39 insertions, 39 deletions

diff --git a/Source/WebKit/android/RenderSkinButton.cpp b/Source/WebKit/android/RenderSkinButton.cpp
index 11e2fa8..7ab50aa 100644
--- a/Source/WebKit/android/RenderSkinButton.cpp
+++ b/Source/WebKit/android/RenderSkinButton.cpp
@@ -76,7 +76,7 @@ void RenderSkinButton::decode()
         path.append(String(gFiles[i]));
         if (!RenderSkinNinePatch::decodeAsset(am, path.utf8().data(), &m_buttons[i])) {
             m_decoded = false;
-            LOGE("RenderSkinButton::decode: button assets failed to decode\n\tWebView buttons will not draw");
+            ALOGE("RenderSkinButton::decode: button assets failed to decode\n\tWebView buttons will not draw");
             return;
         }
     }
diff --git a/Source/WebKit/android/RenderSkinNinePatch.cpp b/Source/WebKit/android/RenderSkinNinePatch.cpp
index faa9dc4..d9f6011 100644
--- a/Source/WebKit/android/RenderSkinNinePatch.cpp
+++ b/Source/WebKit/android/RenderSkinNinePatch.cpp
@@ -53,7 +53,7 @@ bool RenderSkinNinePatch::decodeAsset(AssetManager* am, const char* filename, Ni
     SkImageDecoder* decoder = SkImageDecoder::Factory(&stream);
     if (!decoder) {
         asset->close();
-        LOGE("RenderSkinNinePatch::Failed to create an image decoder");
+        ALOGE("RenderSkinNinePatch::Failed to create an image decoder");
         return false;
     }
 
@@ -68,13 +68,13 @@ bool RenderSkinNinePatch::decodeAsset(AssetManager* am, const char* filename, Ni
     decoder->setPeeker(&peeker);
     if (!decoder->decode(&stream, &ninepatch->m_bitmap, prefConfig, mode, true)) {
         asset->close();
-        LOGE("RenderSkinNinePatch::Failed to decode nine patch asset");
+        ALOGE("RenderSkinNinePatch::Failed to decode nine patch asset");
         return false;
     }
 
     asset->close();
     if (!peeker.fPatchIsValid) {
-        LOGE("RenderSkinNinePatch::Patch data not valid");
+        ALOGE("RenderSkinNinePatch::Patch data not valid");
         return false;
     }
     void** data = &ninepatch->m_serializedPatchData;
diff --git a/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp b/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
index d401f9b..9de9314 100644
--- a/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
+++ b/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.cpp
@@ -200,7 +200,7 @@ bool WebUrlLoaderClient::start(bool isMainResource, bool isMainFrame, bool sync,
 
             syncCondition()->TimedWait(base::TimeDelta::FromSeconds(kCallbackWaitingTime));
             if (m_queue.empty()) {
-                LOGE("Synchronous request timed out after %d seconds for the %dth try, URL: %s",
+                ALOGE("Synchronous request timed out after %d seconds for the %dth try, URL: %s",
                      kCallbackWaitingTime, num_timeout, m_request->getUrl().c_str());
                 num_timeout++;
                 if (num_timeout >= kMaxNumTimeout) {
@@ -254,7 +254,7 @@ void WebUrlLoaderClient::downloadFile()
         if (!m_isCertMimeType)
             cancel();
     } else {
-        LOGE("Unexpected call to downloadFile() before didReceiveResponse(). URL: %s", m_request->getUrl().c_str());
+        ALOGE("Unexpected call to downloadFile() before didReceiveResponse(). URL: %s", m_request->getUrl().c_str());
         // TODO: Turn off asserts crashing before release
         // http://b/issue?id=2951985
         CRASH();
diff --git a/Source/WebKit/android/benchmark/main.cpp b/Source/WebKit/android/benchmark/main.cpp
index df6db86..0dcb80b 100644
--- a/Source/WebKit/android/benchmark/main.cpp
+++ b/Source/WebKit/android/benchmark/main.cpp
@@ -57,7 +57,7 @@ int main(int argc, char** argv) {
         }
     }
     if (optind >= argc) {
-        LOGE("Please supply a file to read\n");
+        ALOGE("Please supply a file to read\n");
         return 1;
     }
 
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
index cd0d0cb..ae430d7 100644
--- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1272,7 +1272,7 @@ static void CreateFrame(JNIEnv* env, jobject obj, jobject javaview, jobject jAss
     String directory = webFrame->getRawResourceFilename(
             WebCore::PlatformBridge::DrawableDir);
     if (directory.isEmpty())
-        LOGE("Can't find the drawable directory");
+        ALOGE("Can't find the drawable directory");
     else {
         // Initialize our skinning classes
         webFrame->setRenderSkins(new WebCore::RenderSkinAndroid(directory));
diff --git a/Source/WebKit/android/jni/WebCoreJni.cpp b/Source/WebKit/android/jni/WebCoreJni.cpp
index 2a07999..b60cb4d 100644
--- a/Source/WebKit/android/jni/WebCoreJni.cpp
+++ b/Source/WebKit/android/jni/WebCoreJni.cpp
@@ -50,7 +50,7 @@ bool checkException(JNIEnv* env)
 {
     if (env->ExceptionCheck() != 0)
     {
-        LOGE("*** Uncaught exception returned from Java call!\n");
+        ALOGE("*** Uncaught exception returned from Java call!\n");
         env->ExceptionDescribe();
         return true;
     }
diff --git a/Source/WebKit/android/jni/WebCoreJniOnLoad.cpp b/Source/WebKit/android/jni/WebCoreJniOnLoad.cpp
index bb71bf5..69280d5 100644
--- a/Source/WebKit/android/jni/WebCoreJniOnLoad.cpp
+++ b/Source/WebKit/android/jni/WebCoreJniOnLoad.cpp
@@ -141,7 +141,7 @@ EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
     jint result = -1;
 
     if (vm->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) {
-        LOGE("GetEnv failed!");
+        ALOGE("GetEnv failed!");
         return result;
     }
     LOG_ASSERT(env, "Could not retrieve the env!");
@@ -150,7 +150,7 @@ EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
     const RegistrationMethod* end = method + sizeof(gWebCoreRegMethods)/sizeof(RegistrationMethod);
     while (method != end) {
         if (method->func(env) < 0) {
-            LOGE("%s registration failed!", method->name);
+            ALOGE("%s registration failed!", method->name);
             return result;
         }
         method++;
diff --git a/Source/WebKit/android/jni/WebIconDatabase.cpp b/Source/WebKit/android/jni/WebIconDatabase.cpp
index e46b600..4a2ea0a 100644
--- a/Source/WebKit/android/jni/WebIconDatabase.cpp
+++ b/Source/WebKit/android/jni/WebIconDatabase.cpp
@@ -188,9 +188,9 @@ static void Open(JNIEnv* env, jobject obj, jstring path)
         ALOGV("Opening WebIconDatabase file '%s'", pathStr.latin1().data());
         bool res = iconDb.open(pathStr, WebCore::IconDatabase::defaultDatabaseFilename());
         if (!res)
-            LOGE("Open failed!");
+            ALOGE("Open failed!");
     } else
-        LOGE("Failed to set permissions on '%s'", fullPath.data());
+        ALOGE("Failed to set permissions on '%s'", fullPath.data());
 }
 
 static void Close(JNIEnv* env, jobject obj)
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index d2b6e6f..83c1f3a 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -1448,12 +1448,12 @@ HTMLElement* WebViewCore::retrieveElement(int x, int y,
         DontHitTestScrollbars, HitTestRequest::Active | HitTestRequest::ReadOnly,
         IntSize(1, 1));
     if (!hitTestResult.innerNode() || !hitTestResult.innerNode()->inDocument()) {
-        LOGE("Should not happen: no in document Node found");
+        ALOGE("Should not happen: no in document Node found");
         return 0;
     }
     const ListHashSet<RefPtr<Node> >& list = hitTestResult.rectBasedTestResult();
     if (list.isEmpty()) {
-        LOGE("Should not happen: no rect-based-test nodes found");
+        ALOGE("Should not happen: no rect-based-test nodes found");
         return 0;
     }
     Node* node = hitTestResult.innerNode();
@@ -1665,7 +1665,7 @@ static IntRect getAbsoluteBoundingBox(Node* node) {
     else if (render->isText())
         rect = toRenderText(render)->linesBoundingBox();
     else
-        LOGE("getAbsoluteBoundingBox failed for node %p, name %s", node, render->renderName());
+        ALOGE("getAbsoluteBoundingBox failed for node %p, name %s", node, render->renderName());
     FloatPoint absPos = render->localToAbsolute();
     rect.move(absPos.x(), absPos.y());
     return rect;
@@ -1679,12 +1679,12 @@ Vector<IntRect> WebViewCore::getTouchHighlightRects(int x, int y, int slop)
     HitTestResult hitTestResult = m_mainFrame->eventHandler()->hitTestResultAtPoint(IntPoint(x, y),
             false, false, DontHitTestScrollbars, HitTestRequest::Active | HitTestRequest::ReadOnly, IntSize(slop, slop));
     if (!hitTestResult.innerNode() || !hitTestResult.innerNode()->inDocument()) {
-        LOGE("Should not happen: no in document Node found");
+        ALOGE("Should not happen: no in document Node found");
         return rects;
     }
     const ListHashSet<RefPtr<Node> >& list = hitTestResult.rectBasedTestResult();
     if (list.isEmpty()) {
-        LOGE("Should not happen: no rect-based-test nodes found");
+        ALOGE("Should not happen: no rect-based-test nodes found");
         return rects;
     }
     Frame* frame = hitTestResult.innerNode()->document()->frame();
@@ -2187,7 +2187,7 @@ String WebViewCore::modifySelection(const int direction, const int axis)
         case AXIS_DOCUMENT:
             return modifySelectionDomNavigationAxis(selection, direction, axis);
         default:
-            LOGE("Invalid navigation axis: %d", axis);
+            ALOGE("Invalid navigation axis: %d", axis);
             return String();
     }
 }
@@ -2704,7 +2704,7 @@ String WebViewCore::modifySelectionDomNavigationAxis(DOMSelection* selection, in
         if (direction == DIRECTION_FORWARD)
             currentNode = currentNode->lastDescendant();
     } else {
-        LOGE("Invalid axis: %d", axis);
+        ALOGE("Invalid axis: %d", axis);
         return String();
     }
     if (currentNode) {
diff --git a/Source/WebKit/android/wds/Connection.cpp b/Source/WebKit/android/wds/Connection.cpp
index d7e55ac..52193e5 100644
--- a/Source/WebKit/android/wds/Connection.cpp
+++ b/Source/WebKit/android/wds/Connection.cpp
@@ -35,7 +35,7 @@
 #if ENABLE(WDS)
 
 #define MAX_CONNECTION_QUEUE 5
-#define log_errno(x) LOGE("%s: %d", x, strerror(errno))
+#define log_errno(x) ALOGE("%s: %d", x, strerror(errno))
 
 namespace android {
 
diff --git a/Source/WebKit/android/wds/DebugServer.cpp b/Source/WebKit/android/wds/DebugServer.cpp
index 494a634..2fde6bd 100644
--- a/Source/WebKit/android/wds/DebugServer.cpp
+++ b/Source/WebKit/android/wds/DebugServer.cpp
@@ -42,7 +42,7 @@
 #if ENABLE(WDS)
 
 #define DEFAULT_PORT 9999
-#define log_errno(x) LOGE("%s: %d", x, strerror(errno))
+#define log_errno(x) ALOGE("%s: %d", x, strerror(errno))
 
 namespace android {
 
@@ -82,7 +82,7 @@ void DebugServer::start() {
 
     ConnectionServer cs;
     if (!cs.connect(DEFAULT_PORT)) {
-        LOGE("Failed to start the server socket connection");
+        ALOGE("Failed to start the server socket connection");
         return;
     }
 
@@ -97,7 +97,7 @@ void DebugServer::start() {
 
         Command* c = Command::Find(conn);
         if (!c) {
-            LOGE("Could not find matching command");
+            ALOGE("Could not find matching command");
             delete conn;
         } else {
             // Dispatch the command, it will handle cleaning up the connection
diff --git a/Source/WebKit/android/wds/client/AdbConnection.cpp b/Source/WebKit/android/wds/client/AdbConnection.cpp
index 617ed72..fe170a9 100644
--- a/Source/WebKit/android/wds/client/AdbConnection.cpp
+++ b/Source/WebKit/android/wds/client/AdbConnection.cpp
@@ -78,7 +78,7 @@ bool AdbConnection::connect() {
 
 bool AdbConnection::sendRequest(const char* fmt, ...) const {
     if (m_fd == -1) {
-        LOGE("Connection is closed");
+        ALOGE("Connection is closed");
         return false;
     }
 
@@ -130,13 +130,13 @@ static void printFailureMessage(int fd) {
         log_errno("Failure reading failure message from adb");
         return;
     } else if (res != payloadLen) {
-        LOGE("Incorrect payload length %d - expected %d", res, payloadLen);
+        ALOGE("Incorrect payload length %d - expected %d", res, payloadLen);
         return;
     }
     msg[res] = 0;
 
     // Tell somebody about it
-    LOGE("Received failure from adb: %s", msg);
+    ALOGE("Received failure from adb: %s", msg);
 
     // Cleanup
     delete[] msg;
@@ -163,7 +163,7 @@ bool AdbConnection::checkOkayResponse() const {
         printFailureMessage(m_fd);
         return false;
     }
-    LOGE("Incorrect response from adb - '%.*s'", res, buf);
+    ALOGE("Incorrect response from adb - '%.*s'", res, buf);
     return false;
 }
 
@@ -178,13 +178,13 @@ const DeviceList& AdbConnection::getDeviceList() {
     clearDevices();
 
     if (m_fd == -1) {
-        LOGE("Connection is closed");
+        ALOGE("Connection is closed");
         return m_devices;
     }
 
     // Try to send the device list request
     if (!sendRequest("host:devices")) {
-        LOGE("Failed to get device list from adb");
+        ALOGE("Failed to get device list from adb");
         return m_devices;
     }
 
@@ -210,7 +210,7 @@ const DeviceList& AdbConnection::getDeviceList() {
         log_errno("Failure reading the device list");
         return m_devices;
     } else if (res != payloadLen) {
-        LOGE("Incorrect payload length %d - expected %d", res, payloadLen);
+        ALOGE("Incorrect payload length %d - expected %d", res, payloadLen);
         return m_devices;
     }
     msg[res] = 0;
diff --git a/Source/WebKit/android/wds/client/ClientUtils.h b/Source/WebKit/android/wds/client/ClientUtils.h
index 7d0db30..7c4b9ce 100644
--- a/Source/WebKit/android/wds/client/ClientUtils.h
+++ b/Source/WebKit/android/wds/client/ClientUtils.h
@@ -37,7 +37,7 @@
 #endif
 
 // Callers need to include Log.h and errno.h to use this macro
-#define log_errno(str) LOGE("%s: %s", str, strerror(errno))
+#define log_errno(str) ALOGE("%s: %s", str, strerror(errno))
 
 // Fill in the sockaddr_in structure for binding to the localhost on the given
 // port
diff --git a/Source/WebKit/android/wds/client/main.cpp b/Source/WebKit/android/wds/client/main.cpp
index 7e96f30..276affe 100644
--- a/Source/WebKit/android/wds/client/main.cpp
+++ b/Source/WebKit/android/wds/client/main.cpp
@@ -74,7 +74,7 @@ int main(int argc, char** argv) {
     Device::DeviceType type = Device::NONE;
 
     if (argc <= 1) {
-        LOGE("wdsclient takes at least 1 argument");
+        ALOGE("wdsclient takes at least 1 argument");
         return 1;
     } else {
         // Parse the options, look for -e or -d to choose a device.
@@ -94,7 +94,7 @@ int main(int argc, char** argv) {
             }
         }
         if (optind == argc) {
-            LOGE("No command specified");
+            ALOGE("No command specified");
             return 1;
         }
     }
@@ -109,10 +109,10 @@ int main(int argc, char** argv) {
 
     // No device specified and more than one connected, bail
     if (type == Device::NONE && devices.size() > 1) {
-        LOGE("More than one device/emulator, please specify with -e or -d");
+        ALOGE("More than one device/emulator, please specify with -e or -d");
         return 1;
     } else if (devices.size() == 0) {
-        LOGE("No devices connected");
+        ALOGE("No devices connected");
         return 1;
     }
 
@@ -131,13 +131,13 @@ int main(int argc, char** argv) {
     }
 
     if (!device) {
-        LOGE("No device found!");
+        ALOGE("No device found!");
         return 1;
     }
 
     // Forward tcp:9999
     if (!device->sendRequest("forward:tcp:" PORT_STR ";tcp:" PORT_STR)) {
-        LOGE("Failed to send forwarding request");
+        ALOGE("Failed to send forwarding request");
         return 1;
     }
 
@@ -147,7 +147,7 @@ int main(int argc, char** argv) {
     int commandLen = strlen(command);
 #define WDS_COMMAND_LENGTH 4
     if (commandLen != WDS_COMMAND_LENGTH) {
-        LOGE("Commands must be 4 characters '%s'", command);
+        ALOGE("Commands must be 4 characters '%s'", command);
         return 1;
     }