Modified: trunk/Source/WebKit/blackberry/ChangeLog (129042 => 129043)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-09-19 21:09:01 UTC (rev 129042)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-09-19 21:10:14 UTC (rev 129043)
@@ -1,3 +1,16 @@
+2012-09-19 Nima Ghanavatian <[email protected]>
+
+ [BlackBerry] Clean up the SpellingLog output
+ https://bugs.webkit.org/show_bug.cgi?id=97129
+
+ Reviewed by Rob Buis.
+
+ Internally reviewed by Mike Fenton.
+
+ * WebKitSupport/InputHandler.cpp:
+ (BlackBerry::WebKit::InputHandler::spellCheckingRequestCancelled):
+ (BlackBerry::WebKit::InputHandler::spellCheckingRequestProcessed):
+
2012-09-19 Mike Fenton <[email protected]>
[BlackBerry] Add SpellingLog for spell checking options request.
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (129042 => 129043)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp 2012-09-19 21:09:01 UTC (rev 129042)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp 2012-09-19 21:10:14 UTC (rev 129043)
@@ -603,18 +603,21 @@
void InputHandler::spellCheckingRequestCancelled(int32_t transactionId)
{
- if (transactionId != m_processingTransactionId)
- SpellingLog(LogLevelWarn, "InputHandler::spellCheckingRequestCancelled We are out of sync with input service. Expected transaction id %d, received %d.", m_processingTransactionId, transactionId);
- else
- SpellingLog(LogLevelWarn, "InputHandler::spellCheckingRequestCancelled Request with transaction id %d has been cancelled.", transactionId);
+ SpellingLog(LogLevelWarn, "InputHandler::spellCheckingRequestCancelled Expected transaction id %d, received %d. %s"
+ , transactionId
+ , m_processingTransactionId
+ , transactionId == m_processingTransactionId ? "" : "We are out of sync with input service.");
+
m_request->didCancel();
m_processingTransactionId = -1;
}
void InputHandler::spellCheckingRequestProcessed(int32_t transactionId, spannable_string_t* spannableString)
{
- if (transactionId != m_processingTransactionId)
- SpellingLog(LogLevelWarn, "InputHandler::spellCheckingRequestProcessed We are out of sync with input service. Expected transaction id %d, received %d.", m_processingTransactionId, transactionId);
+ SpellingLog(LogLevelWarn, "InputHandler::spellCheckingRequestProcessed Expected transaction id %d, received %d. %s"
+ , transactionId
+ , m_processingTransactionId
+ , transactionId == m_processingTransactionId ? "" : "We are out of sync with input service.");
if (!spannableString || !isActiveTextEdit()) {
SpellingLog(LogLevelWarn, "InputHandler::spellCheckingRequestProcessed Cancelling request with transactionId %d.", transactionId);
