Merge Chromium at r65505: Update log message handler

Add new parameters to our error logging handler.

WebKit/android/WebCoreSupport/ChromiumLogging.cpp
http://src.chromium.org/viewvc/chrome?view=rev&revision=65062

Change-Id: I6f34f2c5170b218c81894da541c923782e150e2e

1 files changed, 2 insertions, 2 deletions

diff --git a/WebKit/android/WebCoreSupport/ChromiumLogging.cpp b/WebKit/android/WebCoreSupport/ChromiumLogging.cpp
index 07fbeb8..cde2493 100644
--- a/WebKit/android/WebCoreSupport/ChromiumLogging.cpp
+++ b/WebKit/android/WebCoreSupport/ChromiumLogging.cpp
@@ -33,7 +33,7 @@
 
 namespace android {
 
-bool logMessageHandler(int severity, const std::string& str) {
+bool logMessageHandler(int severity, const char* file, int line, size_t message_start, const std::string& str) {
     int androidSeverity = ANDROID_LOG_VERBOSE;
     switch(severity) {
     case logging::LOG_FATAL:
@@ -50,7 +50,7 @@ bool logMessageHandler(int severity, const std::string& str) {
         androidSeverity = ANDROID_LOG_VERBOSE;
         break;
     }
-    android_printLog(androidSeverity, "chromium", "%s", str.c_str());
+    android_printLog(androidSeverity, "chromium", "%s:%d: %s", file, line, str.c_str());
     return false;
 }