commit 9ad1eac377ffa6ffd34afae4c6580b7ba7508c31
author Mathew Inwood <mathewi@google.com> Thu Sep 15 11:29:50 2011 +0100
committer Mathew Inwood <mathewi@google.com> Thu Sep 15 11:37:35 2011 +0100
tree bb0a791ab8e220a85e44d8f7243be00e1a989dbc
parent 7883b4453338a00d58707e4fd257492a09b1e824

Revert "Support for measuring page load times."

The page load time measurement was a stop gap measure until server side
support is ready, and we don't want to ship with it in.

Bug: 5266893

This reverts commit b4e831bf1ff62945199b89a77ad039be7bd16545.

Change-Id: Iafc08cea88774e5ecf018112a25e4dc2993a4623

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 8dcc54b..8c9dc02 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -66,6 +66,8 @@
 import android.webkit.WebView.PictureListener;
 import android.webkit.WebViewClient;
 import android.widget.CheckBox;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.android.browser.TabControl.OnThumbnailUpdatedListener;
@@ -172,13 +174,10 @@
     private Handler mHandler;
 
     /**
-     * See {@link #clearBackStackWhenItemAdded(Pattern)}.
+     * See {@link #clearBackStackWhenItemAdded(String)}.
      */
     private Pattern mClearHistoryUrlPattern;
 
-    private OnPageLoadCompleteListener mOnPageLoadCompleteListener;
-    private Pattern mOnPageLoadCompleteUrlMatch;
-
     private static synchronized Bitmap getDefaultFavicon(Context context) {
         if (sDefaultFavicon == null) {
             sDefaultFavicon = BitmapFactory.decodeResource(
@@ -533,26 +532,6 @@
         }
     }
 
-    public interface OnPageLoadCompleteListener {
-        void onPageLoadComplete();
-    }
-
-    /**
-     * Requests a notification when the next page load completes. This is a one shot notification,
-     * the listener will be discarded after the first callback, or if the page load is cancelled.
-     * @param listener
-     */
-    public void setOnPageLoadCompleteListener(Pattern urlMatch,
-            OnPageLoadCompleteListener listener) {
-        mOnPageLoadCompleteListener = listener;
-        mOnPageLoadCompleteUrlMatch = urlMatch;
-    }
-
-    public void clearPageLoadCompleteListener() {
-        mOnPageLoadCompleteListener = null;
-        mOnPageLoadCompleteUrlMatch = null;
-    }
-
     // -------------------------------------------------------------------------
     // WebViewClient implementation for the main WebView
     // -------------------------------------------------------------------------
@@ -616,13 +595,6 @@
 
         @Override
         public void onPageFinished(WebView view, String url) {
-            if (mOnPageLoadCompleteListener != null) {
-                if (mOnPageLoadCompleteUrlMatch == null
-                        || mOnPageLoadCompleteUrlMatch.matcher(url).matches())
-                mOnPageLoadCompleteListener.onPageLoadComplete();
-                mOnPageLoadCompleteListener = null;
-                mOnPageLoadCompleteUrlMatch = null;
-            }
             if (!mInPageLoad) {
                 // In page navigation links (www.something.com#footer) will
                 // trigger an onPageFinished which we don't care about.
@@ -2070,7 +2042,6 @@
             mCurrentState = new PageState(mContext, false, url, null);
             mWebViewController.onPageStarted(this, mMainView, null);
             mMainView.loadUrl(url, headers);
-            clearPageLoadCompleteListener();
         }
     }
 
@@ -2122,14 +2093,12 @@
 
     public void goBack() {
         if (mMainView != null) {
-            clearPageLoadCompleteListener();
             mMainView.goBack();
         }
     }
 
     public void goForward() {
         if (mMainView != null) {
-            clearPageLoadCompleteListener();
             mMainView.goForward();
         }
     }