commit c70ae6384e8a98afb98b937b490d0e1c9a88a35f
author Vivek Sekhar <vsekhar@codeaurora.org> Wed Apr 08 17:54:05 2015 -0700
committer WebTech Code Review <code-review@localhost> Tue Apr 21 13:55:03 2015 -0700
tree 75912f23865ef312dc5a139e93375084d88abedc
parent 4f5137dd251c0ed9fde8bcd0dca46d04c662b4bd

Cleanup tab crash view from browser

Change-Id: Ic382071ef6cfdac1a45e187d331493fe15b0f1b3

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 7ea2955..cc9ddbd 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -109,7 +109,6 @@
     private static final int INITIAL_PROGRESS = 5;
 
     private static Bitmap sDefaultFavicon;
-    protected boolean hasCrashed = false;
 
     private static Paint sAlphaPaint = new Paint();
     static {
@@ -327,36 +326,6 @@
         }
     }
 
-    protected void replaceCrashView(View view, View container) {
-        if (hasCrashed && (view == mMainView)) {
-            final FrameLayout wrapper = (FrameLayout) container.findViewById(R.id.webview_wrapper);
-            wrapper.removeAllViewsInLayout();
-            wrapper.addView(view);
-            hasCrashed = false;
-        }
-        mMainView.reload();
-    }
-
-    protected void showCrashView() {
-        if (hasCrashed) {
-            LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(
-                Context.LAYOUT_INFLATER_SERVICE);
-            final View crashLayout = inflater.inflate(R.layout.browser_tab_crash, null);
-            final FrameLayout wrapper =
-                    (FrameLayout) mContainer.findViewById(R.id.webview_wrapper);
-            wrapper.removeAllViewsInLayout();
-            wrapper.addView(crashLayout);
-            mContainer.requestFocus();
-            Button reloadBtn = (Button) crashLayout.findViewById(R.id.browser_crash_reload_btn);
-            reloadBtn.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View arg0) {
-                    replaceCrashView(mMainView, mContainer);
-                }
-            });
-        }
-    }
-
     public void setNetworkAvailable(boolean networkUp) {
         if (networkUp && mReceivedError && (mMainView != null)) {
             mMainView.reload();
@@ -660,15 +629,6 @@
             }, null, null, host, port, null);
         }
 
-        @Override
-        public void onRendererCrash(WebView view, boolean crashedWhileOomProtected) {
-            Log.e(LOGTAG, "Tab Crashed");
-            if (mWebViewController.getTabControl().getCurrentTab() == Tab.this) {
-                hasCrashed = true;
-                showCrashView();
-            }
-        }
-
         /**
          * Handles an HTTP authentication request.
          *
@@ -1583,11 +1543,6 @@
 
     void resume() {
         if (mMainView != null) {
-            if (mMainView.hasCrashed()) {
-                // Reload if render process has crashed. This is done here so that
-                // setFocus call sends wasShown message to correct render process.
-                mMainView.setNeedsReload(true);
-            }
             setupHwAcceleration(mMainView);
             mMainView.onResume();
             if (mSubView != null) {
@@ -2037,7 +1992,7 @@
             return;
         }
 
-        if (!mFirstVisualPixelPainted) {
+        if (!mFirstVisualPixelPainted || mMainView.isShowingCrashView()) {
             mCapture = Bitmap.createBitmap(
                     mCaptureWidth,
                     mCaptureHeight,