Merge "Start the synchronous load in the WebCore thread."

2010-03-02 08:21:22 -08:00
parent 04218254ec 5f38e1aaa1
commit c2ca936700
1 changed files with 6 additions and 2 deletions
--- 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;