Bug 1282338 - Fix log output of IMContextWrapper::OnDeleteSurroundingNative. r?masayuki draft
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Mon, 27 Jun 2016 10:40:02 +0900
changeset 381388 a2754214808c01927f12bdb171cd6236014802c7
parent 381369 c2da34d96746288b5fee27bf6542a12c9f410988
child 523950 92f916f6fa24b4dc0ede855063d36b0efe33e53a
push id21462
push userm_kato@ga2.so-net.ne.jp
push dateMon, 27 Jun 2016 01:42:36 +0000
reviewersmasayuki
bugs1282338
milestone50.0a1
Bug 1282338 - Fix log output of IMContextWrapper::OnDeleteSurroundingNative. r?masayuki IMContextWrapper::OnDeleteSurroundingNative should output aOutput and aNChar correctly. MozReview-Commit-ID: 46UrnGajnTG
widget/gtk/IMContextWrapper.cpp
--- a/widget/gtk/IMContextWrapper.cpp
+++ b/widget/gtk/IMContextWrapper.cpp
@@ -1182,19 +1182,19 @@ IMContextWrapper::OnDeleteSurroundingCal
 }
 
 gboolean
 IMContextWrapper::OnDeleteSurroundingNative(GtkIMContext* aContext,
                                             gint aOffset,
                                             gint aNChars)
 {
     MOZ_LOG(gGtkIMLog, LogLevel::Info,
-        ("GTKIM: %p OnDeleteSurroundingNative(aContext=%p, aOffset=%ld, "
-         "aNChar=%ld), current context=%p",
-         this, aContext, GetCurrentContext()));
+        ("GTKIM: %p OnDeleteSurroundingNative(aContext=%p, aOffset=%d, "
+         "aNChar=%d), current context=%p",
+         this, aContext, aOffset, aNChars, GetCurrentContext()));
 
     // See bug 472635, we should do nothing if IM context doesn't match.
     if (GetCurrentContext() != aContext) {
         MOZ_LOG(gGtkIMLog, LogLevel::Error,
             ("GTKIM: %p   OnDeleteSurroundingNative(), FAILED, "
              "given context doesn't match",
              this));
         return FALSE;
@@ -2056,17 +2056,17 @@ IMContextWrapper::GetCurrentParagraph(ns
 }
 
 nsresult
 IMContextWrapper::DeleteText(GtkIMContext* aContext,
                              int32_t aOffset,
                              uint32_t aNChars)
 {
     MOZ_LOG(gGtkIMLog, LogLevel::Info,
-        ("GTKIM: %p DeleteText(aContext=%p, aOffset=%d, aNChars=%d), "
+        ("GTKIM: %p DeleteText(aContext=%p, aOffset=%d, aNChars=%u), "
          "mCompositionState=%s",
          this, aContext, aOffset, aNChars, GetCompositionStateName()));
 
     if (!mLastFocusedWindow) {
         MOZ_LOG(gGtkIMLog, LogLevel::Error,
             ("GTKIM: %p   DeleteText(), FAILED, there are no focused window "
              "in this module",
              this));