summaryrefslogtreecommitdiff
path: root/core/java/android/webkit/FrameLoader.java
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2010-03-01 23:10:10 -0800
committerGrace Kloba <klobag@google.com>2010-03-01 23:10:10 -0800
commit5f38e1aaa1ad51d82be8e508cbdb568779698972 (patch)
tree41bbf8acb90b8063c174689f38de65ada5100317 /core/java/android/webkit/FrameLoader.java
parent883dbacb12a003f8f46c3faab26b744fdef649a1 (diff)
Start the synchronous load in the WebCore thread.
Fix http://b/issue?id=2480606
Diffstat (limited to 'core/java/android/webkit/FrameLoader.java')
-rw-r--r--core/java/android/webkit/FrameLoader.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/webkit/FrameLoader.java b/core/java/android/webkit/FrameLoader.java
index 790363227bb9..dacb33f9b2ea 100644
--- a/core/java/android/webkit/FrameLoader.java
+++ b/core/java/android/webkit/FrameLoader.java
@@ -110,8 +110,12 @@ class FrameLoader {
return false;
}
mNetwork = Network.getInstance(mListener.getContext());
- WebViewWorker.getHandler().obtainMessage(
- WebViewWorker.MSG_ADD_HTTPLOADER, this).sendToTarget();
+ if (mListener.isSynchronous()) {
+ handleHTTPLoad();
+ } else {
+ WebViewWorker.getHandler().obtainMessage(
+ WebViewWorker.MSG_ADD_HTTPLOADER, this).sendToTarget();
+ }
return true;
} else if (handleLocalFile(url, mListener, mSettings)) {
return true;