Bug 1282338 - Fix log output of IMContextWrapper::OnDeleteSurroundingNative. r=masayuki
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Mon, 27 Jun 2016 10:40:02 +0900
changeset 302678 e68e0c28c1b1ed8ac55693f4fb0f6ebb14b74436
parent 302677 1319c4c60bbed1d89c1bdc9d042bf7545ed7e6ad
child 302679 6ec2097515dc60d8dde4532eb8db1d767a89ffa0
child 302694 0e3f8401b804702c894eb5fdf7eae3cbdf618668
push id78825
push userm_kato@ga2.so-net.ne.jp
push dateMon, 27 Jun 2016 04:55:02 +0000
treeherdermozilla-inbound@e68e0c28c1b1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmasayuki
bugs1282338
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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));