set up the loader so the plugin will receive the first block of data

this makes our port follow the pattern of the gtk port

fixes http://b/2484987

Change-Id: I7119a4b84c12f5ed69a9f260148536a3b76016d6

1 files changed, 11 insertions, 11 deletions

diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index be68106..60598f8 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -681,7 +681,17 @@ void FrameLoaderClientAndroid::didRunInsecureContent(SecurityOrigin*)
 }
 
 void FrameLoaderClientAndroid::committedLoad(DocumentLoader* loader, const char* data, int length) {
-    ASSERT(m_frame);
+    if (!m_manualLoader) {
+        ASSERT(m_frame);
+        String encoding = loader->overrideEncoding();
+        bool userChosen = !encoding.isNull();
+        if (encoding.isNull())
+            encoding = loader->response().textEncodingName();
+        loader->frameLoader()->setEncoding(encoding, userChosen);
+        Document *doc = m_frame->document();
+        if (doc)
+            loader->frameLoader()->addData(data, length);
+    }
     if (m_manualLoader) {
         if (!m_hasSentResponseToPlugin) {
             m_manualLoader->didReceiveResponse(loader->response());
@@ -692,16 +702,6 @@ void FrameLoaderClientAndroid::committedLoad(DocumentLoader* loader, const char*
             m_hasSentResponseToPlugin = true;
         }
         m_manualLoader->didReceiveData(data, length);
-        return;
-    }
-    String encoding = loader->overrideEncoding();
-    bool userChosen = !encoding.isNull();
-    if (encoding.isNull())
-        encoding = loader->response().textEncodingName();
-    loader->frameLoader()->setEncoding(encoding, userChosen);
-    Document *doc = m_frame->document();
-    if (doc) {
-        loader->frameLoader()->addData(data, length);
     }
 }