diff options
author | Steve Block <steveblock@google.com> | 2012-01-05 23:21:10 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-06 00:34:28 +0000 |
commit | 7d99b5804f0800191b03d83fc8f8d2886271475b (patch) | |
tree | 3a582fdf24741000d3f13f5d7ba3863fb5d2b99b /Source/WebKit | |
parent | adb2294ad0d25b191c3cb387c30dcd00f3c5141d (diff) | |
download | external_webkit-7d99b5804f0800191b03d83fc8f8d2886271475b.zip external_webkit-7d99b5804f0800191b03d83fc8f8d2886271475b.tar.gz external_webkit-7d99b5804f0800191b03d83fc8f8d2886271475b.tar.bz2 |
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065
Bug: 5449033
Change-Id: Ia6cf33690679476e7d39c63fa59505491217fdde
Diffstat (limited to 'Source/WebKit')
-rw-r--r-- | Source/WebKit/android/jni/WebCoreFrameBridge.cpp | 10 | ||||
-rw-r--r-- | Source/WebKit/android/jni/WebHistory.cpp | 4 | ||||
-rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp index 20147e9..cd0d0cb 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -2081,27 +2081,27 @@ static void SslClientCert(JNIEnv *env, jobject obj, int handle, jbyteArray pkey, static void AuthenticationProceed(JNIEnv *env, jobject obj, int handle, jstring jUsername, jstring jPassword) { - LOGW("Chromium authentication API called, but libchromium is not available"); + ALOGW("Chromium authentication API called, but libchromium is not available"); } static void AuthenticationCancel(JNIEnv *env, jobject obj, int handle) { - LOGW("Chromium authentication API called, but libchromium is not available"); + ALOGW("Chromium authentication API called, but libchromium is not available"); } static void SslCertErrorProceed(JNIEnv *env, jobject obj, int handle) { - LOGW("Chromium SSL API called, but libchromium is not available"); + ALOGW("Chromium SSL API called, but libchromium is not available"); } static void SslCertErrorCancel(JNIEnv *env, jobject obj, int handle, int cert_error) { - LOGW("Chromium SSL API called, but libchromium is not available"); + ALOGW("Chromium SSL API called, but libchromium is not available"); } static void SslClientCert(JNIEnv *env, jobject obj, int handle, jbyteArray privateKey, jobjectArray chain) { - LOGW("Chromium SSL API called, but libchromium is not available"); + ALOGW("Chromium SSL API called, but libchromium is not available"); } #endif // USE(CHROME_NETWORK_STACK) diff --git a/Source/WebKit/android/jni/WebHistory.cpp b/Source/WebKit/android/jni/WebHistory.cpp index 3b7c7a5..c0b1e6e 100644 --- a/Source/WebKit/android/jni/WebHistory.cpp +++ b/Source/WebKit/android/jni/WebHistory.cpp @@ -246,7 +246,7 @@ void WebHistoryItem::updateHistoryItem(WebCore::HistoryItem* item) { // if the parent only has one ref, it is from this WebHistoryItem. // This means that the matching WebCore::HistoryItem has been freed. // This can happen during clear(). - LOGW("Can't updateHistoryItem as the top HistoryItem is gone"); + ALOGW("Can't updateHistoryItem as the top HistoryItem is gone"); return; } while (webItem->parent()) @@ -256,7 +256,7 @@ void WebHistoryItem::updateHistoryItem(WebCore::HistoryItem* item) { // If a HistoryItem only exists for page cache, it is possible that // the parent HistoryItem destroyed before the child HistoryItem. If // it happens, skip updating. - LOGW("Can't updateHistoryItem as the top HistoryItem is gone"); + ALOGW("Can't updateHistoryItem as the top HistoryItem is gone"); return; } } diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index 6f95072..c720d19 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -1598,7 +1598,7 @@ void WebViewCore::updateFrameCache() // once the recalculation is complete. // TODO: Do we need to reschedule an update for after the style is recalculated? if (m_mainFrame && m_mainFrame->document() && m_mainFrame->document()->isPendingStyleRecalc()) { - LOGW("updateFrameCache: pending style recalc, ignoring."); + ALOGW("updateFrameCache: pending style recalc, ignoring."); return; } m_frameCacheOutOfDate = false; @@ -3185,7 +3185,7 @@ bool WebViewCore::handleTouchEvent(int action, Vector<int>& ids, Vector<IntPoint default: // We do not support other kinds of touch event inside WebCore // at the moment. - LOGW("Java passed a touch event type that we do not support in WebCore: %d", action); + ALOGW("Java passed a touch event type that we do not support in WebCore: %d", action); return 0; } |