Bug 1363567 - 3. Remove GeckoInterface.getPluginContainer; r=me
authorJim Chen <nchen@mozilla.com>
Mon, 15 May 2017 23:11:18 -0400
changeset 406673 49c90446a20fa279a46e6023b550b61383c19bad
parent 406672 8f9d8749eb5ef4d9d156426435c5f17a20b75601
child 406674 0c8900bc3ec0d42c27871127558078063213f7f0
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1363567
milestone55.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 1363567 - 3. Remove GeckoInterface.getPluginContainer; r=me GeckoInterface.getPluginContainer is no longer used anywhere and can be removed. r=me for trivial patch. MozReview-Commit-ID: 2IoQPqecWus
mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
mobile/android/geckoview/src/main/java/org/mozilla/gecko/BaseGeckoInterface.java
mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
@@ -206,19 +206,17 @@ public abstract class GeckoApp extends G
     protected boolean mIsAbortingAppLaunch;
 
     private PromptService mPromptService;
     protected TextSelection mTextSelection;
 
     protected DoorHangerPopup mDoorHangerPopup;
     protected FormAssistPopup mFormAssistPopup;
 
-
     protected GeckoView mLayerView;
-    private AbsoluteLayout mPluginContainer;
 
     private FullScreenHolder mFullScreenPluginContainer;
     private View mFullScreenPluginView;
 
     private final HashMap<String, PowerManager.WakeLock> mWakeLocks = new HashMap<String, PowerManager.WakeLock>();
 
     protected boolean mLastSessionCrashed;
     protected boolean mShouldRestore;
@@ -1670,17 +1668,16 @@ public abstract class GeckoApp extends G
         // work that's unnecessary after this locale action, and (b) it can
         // cause a loop! See Bug 1011008, Comment 12.
         super.onConfigurationChanged(getResources().getConfiguration());
     }
 
     protected void initializeChrome() {
         mDoorHangerPopup = new DoorHangerPopup(this);
         mDoorHangerPopup.setOnVisibilityChangeListener(this);
-        mPluginContainer = (AbsoluteLayout) findViewById(R.id.plugin_container);
         mFormAssistPopup = (FormAssistPopup) findViewById(R.id.form_assist_popup);
     }
 
     @Override
     public void onDoorHangerShow() {
         final View overlay = getDoorhangerOverlay();
         if (overlay != null) {
             final Animator alphaAnimator = ObjectAnimator.ofFloat(overlay, "alpha", 1);
@@ -2882,19 +2879,16 @@ public abstract class GeckoApp extends G
         }
     }
 
     @Override
     public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
         Permissions.onRequestPermissionsResult(this, permissions, grantResults);
     }
 
-    @Override
-    public AbsoluteLayout getPluginContainer() { return mPluginContainer; }
-
     private static final String CPU = "cpu";
     private static final String SCREEN = "screen";
 
     // Called when a Gecko Hal WakeLock is changed
     @Override
     // We keep the wake lock independent from the function scope, so we need to
     // suppress the linter warning.
     @SuppressLint("Wakelock")
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/BaseGeckoInterface.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/BaseGeckoInterface.java
@@ -45,22 +45,16 @@ public class BaseGeckoInterface implemen
     @Override
     public void notifyWakeLockChanged(String topic, String state) {}
 
     @Override
     public boolean areTabsShown() {
         return false;
     }
 
-    // Bug 908791: Implement this
-    @Override
-    public AbsoluteLayout getPluginContainer() {
-        return null;
-    }
-
     // Bug 908792: Implement this
     @Override
     public void invalidateOptionsMenu() {}
 
     @Override
     public void createShortcut(String title, String URI) {
         // By default, do nothing.
     }
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
@@ -1648,17 +1648,16 @@ public class GeckoAppShell
         public @NonNull EventDispatcher getAppEventDispatcher();
 
         public void enableOrientationListener();
         public void disableOrientationListener();
         public void addAppStateListener(AppStateListener listener);
         public void removeAppStateListener(AppStateListener listener);
         public void notifyWakeLockChanged(String topic, String state);
         public boolean areTabsShown();
-        public AbsoluteLayout getPluginContainer();
         public void invalidateOptionsMenu();
         public boolean isForegrounded();
 
         /**
          * Create a shortcut -- generally a home-screen icon -- linking the given title to the given URI.
          * <p>
          * This method is always invoked on the Gecko thread.
          *