diff options
author | Ben Murdoch <benm@google.com> | 2010-11-18 19:54:50 +0000 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-11-22 10:12:27 +0000 |
commit | dd60d15092d3abe1e3a47faa87386d6e9ea96c30 (patch) | |
tree | 81d594cdb343b4647703f1321359555ebc932887 | |
parent | 64d86dbf35010dd4f7e68cdec4b2d88cfb4b0db8 (diff) | |
download | external_webkit-dd60d15092d3abe1e3a47faa87386d6e9ea96c30.zip external_webkit-dd60d15092d3abe1e3a47faa87386d6e9ea96c30.tar.gz external_webkit-dd60d15092d3abe1e3a47faa87386d6e9ea96c30.tar.bz2 |
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
-rw-r--r-- | WebKit/android/WebCoreSupport/ChromiumLogging.cpp | 4 |
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; } |