Bug 1284422 part.8 Fix odd indent of MOZ_LOG() in nsGtkKeyUtils.cpp (mainly caused by replacing from PR_LOG()) r?m_kato draft
authorMasayuki Nakano <masayuki@d-toybox.com>
Tue, 05 Jul 2016 18:50:02 +0900
changeset 384522 def55ae6bcf5326bd8cd64d065055fa955ca0c73
parent 384521 f1193a3c0bc61202354d52d8ff068db91e08492e
child 384523 277831a1fa63af3008a85d000aa17e176bacc54f
push id22289
push usermasayuki@d-toybox.com
push dateWed, 06 Jul 2016 14:02:00 +0000
reviewersm_kato
bugs1284422
milestone50.0a1
Bug 1284422 part.8 Fix odd indent of MOZ_LOG() in nsGtkKeyUtils.cpp (mainly caused by replacing from PR_LOG()) r?m_kato MozReview-Commit-ID: KOOeJeKiBAF
widget/gtk/nsGtkKeyUtils.cpp
--- a/widget/gtk/nsGtkKeyUtils.cpp
+++ b/widget/gtk/nsGtkKeyUtils.cpp
@@ -214,75 +214,75 @@ void
 KeymapWrapper::InitXKBExtension()
 {
     PodZero(&mKeyboardState);
 
     int xkbMajorVer = XkbMajorVersion;
     int xkbMinorVer = XkbMinorVersion;
     if (!XkbLibraryVersion(&xkbMajorVer, &xkbMinorVer)) {
         MOZ_LOG(gKeymapWrapperLog, LogLevel::Info,
-               ("%p InitXKBExtension failed due to failure of "
-                "XkbLibraryVersion()", this));
+            ("%p InitXKBExtension failed due to failure of "
+             "XkbLibraryVersion()", this));
         return;
     }
 
     Display* display =
         gdk_x11_display_get_xdisplay(gdk_display_get_default());
 
     // XkbLibraryVersion() set xkbMajorVer and xkbMinorVer to that of the
     // library, which may be newer than what is required of the server in
     // XkbQueryExtension(), so these variables should be reset to
     // XkbMajorVersion and XkbMinorVersion before the XkbQueryExtension call.
     xkbMajorVer = XkbMajorVersion;
     xkbMinorVer = XkbMinorVersion;
     int opcode, baseErrorCode;
     if (!XkbQueryExtension(display, &opcode, &mXKBBaseEventCode, &baseErrorCode,
                            &xkbMajorVer, &xkbMinorVer)) {
         MOZ_LOG(gKeymapWrapperLog, LogLevel::Info,
-               ("%p InitXKBExtension failed due to failure of "
-                "XkbQueryExtension(), display=0x%p", this, display));
+            ("%p InitXKBExtension failed due to failure of "
+             "XkbQueryExtension(), display=0x%p", this, display));
         return;
     }
 
     if (!XkbSelectEventDetails(display, XkbUseCoreKbd, XkbStateNotify,
                                XkbModifierStateMask, XkbModifierStateMask)) {
         MOZ_LOG(gKeymapWrapperLog, LogLevel::Info,
-               ("%p InitXKBExtension failed due to failure of "
-                "XkbSelectEventDetails() for XModifierStateMask, display=0x%p",
+            ("%p InitXKBExtension failed due to failure of "
+             "XkbSelectEventDetails() for XModifierStateMask, display=0x%p",
                 this, display));
         return;
     }
 
     if (!XkbSelectEventDetails(display, XkbUseCoreKbd, XkbControlsNotify,
                                XkbPerKeyRepeatMask, XkbPerKeyRepeatMask)) {
         MOZ_LOG(gKeymapWrapperLog, LogLevel::Info,
-               ("%p InitXKBExtension failed due to failure of "
-                "XkbSelectEventDetails() for XkbControlsNotify, display=0x%p",
-                this, display));
+            ("%p InitXKBExtension failed due to failure of "
+             "XkbSelectEventDetails() for XkbControlsNotify, display=0x%p",
+             this, display));
         return;
     }
 
     if (!XGetKeyboardControl(display, &mKeyboardState)) {
         MOZ_LOG(gKeymapWrapperLog, LogLevel::Info,
-               ("%p InitXKBExtension failed due to failure of "
-                "XGetKeyboardControl(), display=0x%p",
-                this, display));
+            ("%p InitXKBExtension failed due to failure of "
+             "XGetKeyboardControl(), display=0x%p",
+             this, display));
         return;
     }
 
     MOZ_LOG(gKeymapWrapperLog, LogLevel::Info,
-           ("%p InitXKBExtension, Succeeded", this));
+        ("%p InitXKBExtension, Succeeded", this));
 }
 
 void
 KeymapWrapper::InitBySystemSettings()
 {
     MOZ_LOG(gKeymapWrapperLog, LogLevel::Info,
-      ("%p InitBySystemSettings, mGdkKeymap=%p",
-       this, mGdkKeymap));
+        ("%p InitBySystemSettings, mGdkKeymap=%p",
+         this, mGdkKeymap));
 
     Display* display =
         gdk_x11_display_get_xdisplay(gdk_display_get_default());
 
     int min_keycode = 0;
     int max_keycode = 0;
     XDisplayKeycodes(display, &min_keycode, &max_keycode);
 
@@ -503,19 +503,19 @@ KeymapWrapper::FilterEvents(GdkXEvent* a
             XkbEvent* xkbEvent = (XkbEvent*)xEvent;
             if (xkbEvent->any.xkb_type != XkbControlsNotify ||
                 !(xkbEvent->ctrls.changed_ctrls & XkbPerKeyRepeatMask)) {
                 break;
             }
             if (!XGetKeyboardControl(xkbEvent->any.display,
                                      &self->mKeyboardState)) {
                 MOZ_LOG(gKeymapWrapperLog, LogLevel::Info,
-                       ("%p FilterEvents failed due to failure "
-                        "of XGetKeyboardControl(), display=0x%p",
-                        self, xkbEvent->any.display));
+                    ("%p FilterEvents failed due to failure "
+                     "of XGetKeyboardControl(), display=0x%p",
+                     self, xkbEvent->any.display));
             }
             break;
         }
     }
 
     return GDK_FILTER_CONTINUE;
 }