drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 27185 into eclair

Browse Source 
* changes:
  Add checks for double-dumping on webkit data.
This commit is contained in:
Android (Google) Code Review
2009-09-28 12:21:30 -04:00
parent b19774d520 7216047ac3
commit c18b0ebcfb
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
View File

@ -65,7 +65,13 @@ public class TestShellActivity extends Activity implements LayoutTestController
mTimedOut = true; mTimedOut = true;
if(mCallback != null) if(mCallback != null)
mCallback.timedOut(mWebView.getUrl()); mCallback.timedOut(mWebView.getUrl());
requestWebKitData(); if(!mRequestedWebKitData) {
requestWebKitData();
} else {
// if timed out and webkit data has been dumped before
// finish directly
finished();
}
return; return;
} else if (msg.what == MSG_WEBKIT_DATA) { } else if (msg.what == MSG_WEBKIT_DATA) {
TestShellActivity.this.dump(mTimedOut, (String)msg.obj); TestShellActivity.this.dump(mTimedOut, (String)msg.obj);
@ -83,6 +89,7 @@ public class TestShellActivity extends Activity implements LayoutTestController
throw new AssertionError("Requested webkit data twice: " + mWebView.getUrl()); throw new AssertionError("Requested webkit data twice: " + mWebView.getUrl());
mRequestedWebKitData = true; mRequestedWebKitData = true;
Log.v(LOGTAG, "message sent to WebView to dump text.");
switch (mDumpDataType) { switch (mDumpDataType) {
case DUMP_AS_TEXT: case DUMP_AS_TEXT:
mWebView.documentAsText(callback); mWebView.documentAsText(callback);