Bug 1431601 - Align boolean member in nsViewportInfo. r=botond
authorHiroyuki Ikezoe <hikezoe@mozilla.com>
Mon, 15 Oct 2018 23:53:42 +0000
changeset 489745 ecc77355ba3ecc4ff1e9e8b8053356724b02428c
parent 489744 92c8efea77140bc65e183d4c560550bc91d58eb4
child 489746 930561bbe55d1baaee2d2fde6fb4119e86fce70e
push id247
push userfmarier@mozilla.com
push dateSat, 27 Oct 2018 01:06:44 +0000
reviewersbotond
bugs1431601
milestone64.0a1
Bug 1431601 - Align boolean member in nsViewportInfo. r=botond Differential Revision: https://phabricator.services.mozilla.com/D8316
dom/base/nsViewportInfo.h
--- a/dom/base/nsViewportInfo.h
+++ b/dom/base/nsViewportInfo.h
@@ -22,39 +22,39 @@ static const mozilla::CSSIntSize kViewpo
  * nsIDocument::GetViewportInfo for more information on this functionality.
  */
 class MOZ_STACK_CLASS nsViewportInfo
 {
   public:
     nsViewportInfo(const mozilla::ScreenIntSize& aDisplaySize,
                    const mozilla::CSSToScreenScale& aDefaultZoom,
                    bool aAllowZoom) :
+      mDefaultZoom(aDefaultZoom),
       mDefaultZoomValid(true),
-      mDefaultZoom(aDefaultZoom),
       mAutoSize(true),
       mAllowZoom(aAllowZoom)
     {
         mSize = mozilla::ScreenSize(aDisplaySize) / mDefaultZoom;
         mozilla::CSSToLayoutDeviceScale pixelRatio(1.0f);
         mMinZoom = pixelRatio * kViewportMinScale;
         mMaxZoom = pixelRatio * kViewportMaxScale;
         ConstrainViewportValues();
     }
 
     nsViewportInfo(const mozilla::CSSToScreenScale& aDefaultZoom,
                    const mozilla::CSSToScreenScale& aMinZoom,
                    const mozilla::CSSToScreenScale& aMaxZoom,
                    const mozilla::CSSSize& aSize,
                    bool aAutoSize,
                    bool aAllowZoom) :
-                     mDefaultZoomValid(true),
                      mDefaultZoom(aDefaultZoom),
                      mMinZoom(aMinZoom),
                      mMaxZoom(aMaxZoom),
                      mSize(aSize),
+                     mDefaultZoomValid(true),
                      mAutoSize(aAutoSize),
                      mAllowZoom(aAllowZoom)
     {
       ConstrainViewportValues();
     }
 
     bool IsDefaultZoomValid() const { return mDefaultZoomValid; }
     mozilla::CSSToScreenScale GetDefaultZoom() const { return mDefaultZoom; }
@@ -70,33 +70,33 @@ class MOZ_STACK_CLASS nsViewportInfo
 
     /**
      * Constrain the viewport calculations from the
      * nsIDocument::GetViewportInfo() function in order to always return
      * sane minimum/maximum values.
      */
     void ConstrainViewportValues();
 
-    // If the default zoom was specified and was between the min and max
-    // zoom values.
-    bool mDefaultZoomValid;
-
     // Default zoom indicates the level at which the display is 'zoomed in'
     // initially for the user, upon loading of the page.
     mozilla::CSSToScreenScale mDefaultZoom;
 
     // The minimum zoom level permitted by the page.
     mozilla::CSSToScreenScale mMinZoom;
 
     // The maximum zoom level permitted by the page.
     mozilla::CSSToScreenScale mMaxZoom;
 
     // The size of the viewport, specified by the <meta name="viewport"> tag.
     mozilla::CSSSize mSize;
 
+    // If the default zoom was specified and was between the min and max
+    // zoom values.
+    bool mDefaultZoomValid;
+
     // Whether or not we should automatically size the viewport to the device's
     // width. This is true if the document has been optimized for mobile, and
     // the width property of a specified <meta name="viewport"> tag is either
     // not specified, or is set to the special value 'device-width'.
     bool mAutoSize;
 
     // Whether or not the user can zoom in and out on the page. Default is true.
     bool mAllowZoom;