From 5f38e1aaa1ad51d82be8e508cbdb568779698972 Mon Sep 17 00:00:00 2001
From: Grace Kloba <klobag@google.com>
Date: Mon, 1 Mar 2010 23:10:10 -0800
Subject: Start the synchronous load in the WebCore thread.

Fix http://b/issue?id=2480606
---
 core/java/android/webkit/FrameLoader.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'core/java/android/webkit/FrameLoader.java')

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;
-- 
cgit v1.2.3