Merge WebKit at r67908: FrameLoaderClient now commits data directly to Loader

See http://trac.webkit.org/changeset/67223 and
http://trac.webkit.org/changeset/67253

Change-Id: I46eb23df9a216f2d5a7b0dce857fd5fc323c2fb7

diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index 7f461e2..fa96d40 100644 (file)
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -698,18 +698,9 @@ void FrameLoaderClientAndroid::didRunInsecureContent(SecurityOrigin*)
 }
 
 void FrameLoaderClientAndroid::committedLoad(DocumentLoader* loader, const char* data, int length) {
-    if (!m_manualLoader) {
-        ASSERT(m_frame);
-        String encoding = loader->overrideEncoding();
-        bool userChosen = !encoding.isNull();
-        if (encoding.isNull())
-            encoding = loader->response().textEncodingName();
-        loader->frameLoader()->writer()->setEncoding(encoding, userChosen);
-        Document *doc = m_frame->document();
-        if (doc)
-            loader->frameLoader()->addData(data, length);
-    }
-    if (m_manualLoader) {
+    if (!m_manualLoader)
+        loader->commitData(data, length);
+    else {
         if (!m_hasSentResponseToPlugin) {
             m_manualLoader->didReceiveResponse(loader->response());
             // Failure could cause the main document to have an error causing