Backed out changeset 45f82a11656c (bug 1549576) for GeckoSession.java related checkstyle failures CLOSED TREE
authorBogdan Tara <btara@mozilla.com>
Tue, 07 May 2019 23:20:55 +0300
changeset 531779 1a5f757dd6f90e8a30f81e1131b2f7226a651957
parent 531778 550a15442d5b6b314d9e0385d579656cf48fe2af
child 531780 5add0a9fd0fb6f0f50df29e04b52a16b2975c373
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1549576
milestone68.0a1
backs out45f82a11656c33e633132d8c4d54841e42cc97dc
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
Backed out changeset 45f82a11656c (bug 1549576) for GeckoSession.java related checkstyle failures CLOSED TREE
mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoDisplay.java
mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java
--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoDisplay.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoDisplay.java
@@ -114,17 +114,17 @@ public class GeckoDisplay {
      *
      * @param clippingHeight The height of the bottom clipped space in screen pixels.
      */
     @UiThread
     public void setVerticalClipping(final int clippingHeight) {
         ThreadUtils.assertOnUiThread();
 
         if (mSession != null) {
-            mSession.setFixedBottomOffset(clippingHeight);
+            mSession.mCompositor.setFixedBottomOffset(clippingHeight);
         }
     }
 
     /**
      * Return whether the display should be pinned on the screen.
      *
      * When pinned, the display should not be moved on the screen due to animation, scrolling, etc.
      * A common reason for the display being pinned is when the user is dragging a selection caret
--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java
@@ -128,17 +128,16 @@ public class GeckoSession implements Par
     private int mLeft;
     private int mTop; // Top of the surface (including toolbar);
     private int mClientTop; // Top of the client area (i.e. excluding toolbar);
     private int mOffsetX;
     private int mOffsetY;
     private int mWidth;
     private int mHeight; // Height of the surface (including toolbar);
     private int mClientHeight; // Height of the client area (i.e. excluding toolbar);
-    private int mFixedBottomOffset; // The margin for fixed elements attached to the bottom of the viewport.
     private float mViewportLeft;
     private float mViewportTop;
     private float mViewportZoom = 1.0f;
 
     //
     // NOTE: These values are also defined in
     // gfx/layers/ipc/UiCompositorControllerMessageTypes.h and must be kept in sync. Any
     // new AnimatorMessageType added here must also be added there.
@@ -4746,25 +4745,16 @@ public class GeckoSession implements Par
             return;
         }
 
         mLeft = left;
         mTop = top;
         onWindowBoundsChanged();
     }
 
-    /* package */ void setFixedBottomOffset(int offset) {
-        mFixedBottomOffset = offset;
-
-        if (mCompositorReady) {
-            mCompositor.setFixedBottomOffset(mFixedBottomOffset);
-        }
-    }
-
-
     /* package */ void onCompositorAttached() {
         if (DEBUG) {
             ThreadUtils.assertOnUiThread();
         }
 
         mAttachedCompositor = true;
         mCompositor.attachNPZC(mPanZoomController.mNative);
 
@@ -4875,18 +4865,16 @@ public class GeckoSession implements Par
             // compositor now that the compositor is ready.
             onSurfaceChanged(mSurface, mOffsetX, mOffsetY, mWidth, mHeight);
             mSurface = null;
         }
 
         if (mToolbar != null) {
             mToolbar.onCompositorReady();
         }
-
-        mCompositor.setFixedBottomOffset(mFixedBottomOffset);
     }
 
     /* package */ void updateOverscrollVelocity(final float x, final float y) {
         if (DEBUG) {
             ThreadUtils.assertOnUiThread();
         }
 
         if (mOverscroll == null) {