Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "For synchronous loads, load file URLs in the WebCore thread, rather than in the new WebViewWorker thread"

Browse Source
This commit is contained in:
Steve Block
2010-03-08 08:16:41 -08:00
committed by Android (Google) Code Review
parent 6aa6185709 76619af64c
commit 271f7ae4e3
1 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
core/java/android/webkit/FrameLoader.java
View File

@@ -111,11 +111,10 @@ class FrameLoader {
}
mNetwork = Network.getInstance(mListener.getContext());
if (mListener.isSynchronous()) {
handleHTTPLoad();
} else {
WebViewWorker.getHandler().obtainMessage(
WebViewWorker.MSG_ADD_HTTPLOADER, this).sendToTarget();
return handleHTTPLoad();
}
WebViewWorker.getHandler().obtainMessage(
WebViewWorker.MSG_ADD_HTTPLOADER, this).sendToTarget();
return true;
} else if (handleLocalFile(url, mListener, mSettings)) {
return true;
@@ -147,34 +146,53 @@ class FrameLoader {
return true;
}
if (URLUtil.isAssetUrl(url)) {
// load asset in a separate thread as it involves IO
WebViewWorker.getHandler().obtainMessage(
WebViewWorker.MSG_ADD_STREAMLOADER,
new FileLoader(url, loadListener, FileLoader.TYPE_ASSET,
true)).sendToTarget();
if (loadListener.isSynchronous()) {
new FileLoader(url, loadListener, FileLoader.TYPE_ASSET,
true).load();
} else {
// load asset in a separate thread as it involves IO
WebViewWorker.getHandler().obtainMessage(
WebViewWorker.MSG_ADD_STREAMLOADER,
new FileLoader(url, loadListener, FileLoader.TYPE_ASSET,
true)).sendToTarget();
}
return true;
} else if (URLUtil.isResourceUrl(url)) {
// load resource in a separate thread as it involves IO
WebViewWorker.getHandler().obtainMessage(
WebViewWorker.MSG_ADD_STREAMLOADER,
new FileLoader(url, loadListener, FileLoader.TYPE_RES,
true)).sendToTarget();
if (loadListener.isSynchronous()) {
new FileLoader(url, loadListener, FileLoader.TYPE_RES,
true).load();
} else {
// load resource in a separate thread as it involves IO
WebViewWorker.getHandler().obtainMessage(
WebViewWorker.MSG_ADD_STREAMLOADER,
new FileLoader(url, loadListener, FileLoader.TYPE_RES,
true)).sendToTarget();
}
return true;
} else if (URLUtil.isFileUrl(url)) {
// load file in a separate thread as it involves IO
WebViewWorker.getHandler().obtainMessage(
WebViewWorker.MSG_ADD_STREAMLOADER,
new FileLoader(url, loadListener, FileLoader.TYPE_FILE,
settings.getAllowFileAccess())).sendToTarget();
if (loadListener.isSynchronous()) {
new FileLoader(url, loadListener, FileLoader.TYPE_FILE,
settings.getAllowFileAccess()).load();
} else {
// load file in a separate thread as it involves IO
WebViewWorker.getHandler().obtainMessage(
WebViewWorker.MSG_ADD_STREAMLOADER,
new FileLoader(url, loadListener, FileLoader.TYPE_FILE,
settings.getAllowFileAccess())).sendToTarget();
}
return true;
} else if (URLUtil.isContentUrl(url)) {
// Send the raw url to the ContentLoader because it will do a
// permission check and the url has to match.
// load content in a separate thread as it involves IO
WebViewWorker.getHandler().obtainMessage(
WebViewWorker.MSG_ADD_STREAMLOADER,
new ContentLoader(loadListener.url(), loadListener))
.sendToTarget();
if (loadListener.isSynchronous()) {
new ContentLoader(loadListener.url(), loadListener).load();
} else {
// load content in a separate thread as it involves IO
WebViewWorker.getHandler().obtainMessage(
WebViewWorker.MSG_ADD_STREAMLOADER,
new ContentLoader(loadListener.url(), loadListener))
.sendToTarget();
}
return true;
} else if (URLUtil.isDataUrl(url)) {
// load data in the current thread to reduce the latency