From 7757656a11ba7050274c337fd2dc2f18f9e7806f Mon Sep 17 00:00:00 2001
From: Guang Zhu <guangzhu@google.com>
Date: Sun, 7 Jun 2009 13:12:20 -0700
Subject: [PATCH] Changed logic to handle timeout pages.

---
 .../android/dumprendertree/ReliabilityTestActivity.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java
index cbec104d1d61d..8e7ac08c519b1 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java
@@ -134,6 +134,7 @@ public class ReliabilityTestActivity extends Activity {
         webView.stopLoading();
         Log.v(LOGTAG, "Page timeout triggered, progress = " + progress);
         timeoutFlag = true;
+        handler.postDelayed(pageDoneRunner, manualDelay);
     }
     
     public boolean waitUntilDone() {
@@ -181,7 +182,7 @@ public class ReliabilityTestActivity extends Activity {
         @Override
         public void onReceivedHttpAuthRequest(WebView view, HttpAuthHandler handler, String host,
                 String realm) {
-            //cancel http auth request
+            // cancel http auth request
             handler.cancel();
         }
         
@@ -194,7 +195,9 @@ public class ReliabilityTestActivity extends Activity {
         @Override
         public void onPageFinished(WebView view, String url) {
             Log.v(LOGTAG, "onPageFinished: " + url);
-            handler.postDelayed(new WebViewStatusChecker(), 500);
+            // let handleTimeout take care of finishing the page
+            if(!timeoutFlag)
+                handler.postDelayed(new WebViewStatusChecker(), 500);
         }
     }