Integrate new Reader Mode panel

chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java
index 91ba1058bf466e1a3dd1948b899f12568b2d213f..1cba75a1a3f7c657d518de31a1fc1c1934fcafbd 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java
@@ -17,8 +17,6 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
 import org.chromium.chrome.browser.compositor.layouts.eventfilter.EventFilter;
 import org.chromium.chrome.browser.compositor.scene_layer.SceneLayer;
 import org.chromium.chrome.browser.compositor.scene_layer.StaticTabSceneLayer;
-import org.chromium.chrome.browser.dom_distiller.ReaderModePanel;
-import org.chromium.chrome.browser.dom_distiller.ReaderModePanel.ReaderModePanelLayoutDelegate;
 import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModel;
@@ -59,9 +57,6 @@ public class StaticLayout extends ContextualSearchSupportedLayout {
     private boolean mUnstalling;
     private StaticTabSceneLayer mSceneLayer;
 
-    // TODO(aruslan): look into moving this to an overlay/it's own layout.
-    private ReaderModePanel mReaderModePanel;
-
     /**
      * Creates an instance of the {@link StaticLayout}.
      * @param context             The current Android's context.
@@ -93,12 +88,6 @@ public class StaticLayout extends ContextualSearchSupportedLayout {
         return SizingFlags.HELPER_SUPPORTS_FULLSCREEN;
     }
 
-    @Override
-    public float getTopControlsOffset(float currentOffsetDp) {
-        if (mReaderModePanel == null) return super.getTopControlsOffset(currentOffsetDp);
-        return mReaderModePanel.getTopControlsOffset(currentOffsetDp);
-    }
-
     /**
      * Initialize the layout to be shown.
      * @param time   The current time of the app in ms.
@@ -181,44 +170,9 @@ public class StaticLayout extends ContextualSearchSupportedLayout {
         } else {
             setPostHideState();
         }
-        mReaderModePanel = ReaderModePanel.getReaderModePanel(mTabModelSelector.getTabById(id));
-        if (mReaderModePanel != null) {
-            mReaderModePanel.setLayoutDelegate(new ReaderModePanelLayoutDelegate() {
-                @Override
-                public void requestUpdate() {
-                    StaticLayout.this.requestUpdate();
-                }
-
-                @Override
-                public void setLayoutTabBrightness(float v) {
-                    if (mLayoutTabs != null && mLayoutTabs.length > 0
-                            && mLayoutTabs[0].getId() == id) {
-                        mLayoutTabs[0].setBrightness(v);
-                    }
-                }
-
-                @Override
-                public void setLayoutTabY(float v) {
-                    if (mLayoutTabs != null && mLayoutTabs.length > 0
-                            && mLayoutTabs[0].getId() == id) {
-                        mLayoutTabs[0].setY(v);
-                    }
-                }
-            });
-            final boolean isToolbarVisible = getHeight() == getHeightMinusTopControls();
-            final float dpToPx = getContext().getResources().getDisplayMetrics().density;
-            mReaderModePanel.onSizeChanged(getWidth(), getHeight(), isToolbarVisible, dpToPx);
-        }
         requestRender();
     }
 
-    /**
-     * @return Currently active reader mode panel, or null.
-     */
-    public ReaderModePanel getReaderModePanel() {
-        return mReaderModePanel;
-    }
-
     @Override
     public void unstallImmediately(int tabId) {
         if (mLayoutTabs != null && mLayoutTabs.length > 0 && mLayoutTabs[0].getId() == tabId) {
@@ -266,25 +220,6 @@ public class StaticLayout extends ContextualSearchSupportedLayout {
     }
 
     @Override
-    protected void notifySizeChanged(float width, float height, int orientation) {
-        super.notifySizeChanged(width, height, orientation);
-        if (mReaderModePanel == null) return;
-
-        final boolean isToolbarVisible = getHeight() == getHeightMinusTopControls();
-        final float dpToPx = getContext().getResources().getDisplayMetrics().density;
-        mReaderModePanel.onSizeChanged(width, height, isToolbarVisible, dpToPx);
-    }
-
-    @Override
-    protected boolean onUpdateAnimation(long time, boolean jumpToEnd) {
-        boolean parentAnimating = super.onUpdateAnimation(time, jumpToEnd);
-        boolean panelAnimating = mReaderModePanel != null
-                ? mReaderModePanel.onUpdateAnimation(time, jumpToEnd)
-                : false;
-        return panelAnimating || parentAnimating;
-    }
-
-    @Override
     protected void updateSceneLayer(Rect viewport, Rect contentViewport,
             LayerTitleCache layerTitleCache, TabContentManager tabContentManager,
             ResourceManager resourceManager, ChromeFullscreenManager fullscreenManager) {
@@ -307,9 +242,6 @@ public class StaticLayout extends ContextualSearchSupportedLayout {
         OverlayPanel panel = mPanelManager.getActivePanel();
         if (panel != null && panel.isShowing()) {
             overlayLayer = super.getSceneLayer();
-        } else if (mReaderModePanel != null && mReaderModePanel.isShowing()) {
-            mReaderModePanel.updateSceneLayer(resourceManager);
-            overlayLayer = mReaderModePanel.getSceneLayer();
         }
         mSceneLayer.setContentSceneLayer(overlayLayer);