Fix crash in bottom bar early startup before native.

ScrollingBottomViewSceneLayer extends from SceneLayer and that
does a native call in its constructor, which can cause a crash
if native isn't loaded.

This moves the scene layer to the model and into
initializeWithNative.  This might be a better short term fix
than long term design practice though.

BUG=850804, 852468

Change-Id: I5cda1e24787ea6558d7ac07b3ef49f6503c32243
Reviewed-on: https://chromium-review.googlesource.com/1100130
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Reviewed-by: Pedro Amaral <amaralp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567381}

chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarController.java

@@ -12,7 +12,6 @@ import android.view.ViewStub;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
-import org.chromium.chrome.browser.compositor.scene_layer.ScrollingBottomViewSceneLayer;
 import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
 import org.chromium.chrome.browser.modelutil.PropertyKey;
 import org.chromium.chrome.browser.modelutil.PropertyModelChangeProcessor;
@@ -62,13 +61,9 @@ public class BottomToolbarController {
         mResourceId = toolbarRoot.getId();
         mViewResourceAdapter = toolbarRoot.getResourceAdapter();
 
-        // This is the compositor component of the bottom toolbar views.
-        final ScrollingBottomViewSceneLayer sceneLayer =
-                new ScrollingBottomViewSceneLayer(toolbarRoot, shadowHeight);
-
         PropertyModelChangeProcessor<BottomToolbarModel, ViewHolder, PropertyKey> processor =
-                new PropertyModelChangeProcessor<>(model, new ViewHolder(sceneLayer, toolbarRoot),
-                        new BottomToolbarViewBinder());
+                new PropertyModelChangeProcessor<>(
+                        model, new ViewHolder(toolbarRoot), new BottomToolbarViewBinder());
         model.addObserver(processor);
         mTabSwitcherButtonCoordinator = new TabSwitcherButtonCoordinator(toolbarRoot);
     }

chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarViewBinder.java

@@ -24,19 +24,16 @@ public class BottomToolbarViewBinder
      * be used with the {@link BottomToolbarViewBinder}.
      */
     public static class ViewHolder {
-        /** A handle to the composited bottom toolbar layer. */
-        public final ScrollingBottomViewSceneLayer sceneLayer;
+        /** A handle to the Android View based version of the toolbar. */
+        public final ScrollingBottomViewResourceFrameLayout toolbarRoot;
 
-        /** A handle to the Android {@link ViewGroup} version of the toolbar. */
-        public final ViewGroup toolbarRoot;
+        /** A handle to the composited bottom toolbar layer. */
+        public ScrollingBottomViewSceneLayer sceneLayer;
 
         /**
-         * @param compositedSceneLayer The composited bottom toolbar view.
-         * @param toolbarRootView The Android {@link ViewGroup} toolbar.
+         * @param toolbarRootView The Android View based toolbar.
          */
-        public ViewHolder(
-                ScrollingBottomViewSceneLayer compositedSceneLayer, ViewGroup toolbarRootView) {
-            sceneLayer = compositedSceneLayer;
+        public ViewHolder(ScrollingBottomViewResourceFrameLayout toolbarRootView) {
             toolbarRoot = toolbarRootView;
         }
     }
@@ -50,6 +47,7 @@ public class BottomToolbarViewBinder
     @Override
     public final void bind(BottomToolbarModel model, ViewHolder view, PropertyKey propertyKey) {
         if (BottomToolbarModel.Y_OFFSET == propertyKey) {
+            assert view.sceneLayer != null;
             view.sceneLayer.setYOffset(model.getValue(BottomToolbarModel.Y_OFFSET));
         } else if (BottomToolbarModel.ANDROID_VIEW_VISIBILITY == propertyKey) {
             view.toolbarRoot.setVisibility(
@@ -62,6 +60,9 @@ public class BottomToolbarViewBinder
             view.toolbarRoot.findViewById(R.id.menu_button)
                     .setOnTouchListener(model.getValue(BottomToolbarModel.MENU_BUTTON_LISTENER));
         } else if (BottomToolbarModel.LAYOUT_MANAGER == propertyKey) {
+            assert view.sceneLayer == null;
+            view.sceneLayer = new ScrollingBottomViewSceneLayer(
+                    view.toolbarRoot, view.toolbarRoot.getTopShadowHeight());
             model.getValue(BottomToolbarModel.LAYOUT_MANAGER)
                     .addSceneOverlayToBack(view.sceneLayer);
         } else if (BottomToolbarModel.HOME_BUTTON_LISTENER == propertyKey) {

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ScrollingBottomViewResourceFrameLayout.java

@@ -58,4 +58,11 @@ public class ScrollingBottomViewResourceFrameLayout extends ViewResourceFrameLay
     public void setTopShadowHeight(int height) {
         mTopShadowHeightPx = height;
     }
+
+    /**
+     * @return The height of the view's top shadow in px.
+     */
+    public int getTopShadowHeight() {
+        return mTopShadowHeightPx;
+    }
 }