Remove support for multipart/x-mixed-replace

Source/core/loader/DocumentLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
@@ skipping 82 matching lines @@
     , m_cachedResourceLoader(CachedResourceLoader::create(this))
     , m_writer(m_frame)
     , m_originalRequest(req)
     , m_substituteData(substituteData)
     , m_originalRequestCopy(req)
     , m_request(req)
     , m_committed(false)
     , m_isStopping(false)
     , m_gotFirstByte(false)
     , m_isClientRedirect(false)
-    , m_isLoadingMultipartContent(false)
     , m_wasOnloadHandled(false)
     , m_loadingMainResource(false)
     , m_timeOfLastDataReceived(0.0)
     , m_identifierForLoadWithoutResourceLoader(0)
     , m_dataLoadTimer(this, &DocumentLoader::handleSubstituteDataLoadNow)
     , m_applicationCacheHost(adoptPtr(new ApplicationCacheHost(this)))
 {
 }
 
 FrameLoader* DocumentLoader::frameLoader() const
@@ skipping 210 matching lines @@
 {
     ASSERT(!m_frame->page()->defersLoading() || InspectorInstrumentation::isDebuggerPaused(m_frame));
 
     RefPtr<DocumentLoader> protect(this);
 
     if (m_identifierForLoadWithoutResourceLoader) {
         frameLoader()->notifier()->dispatchDidFinishLoading(this, m_identifierForLoadWithoutResourceLoader, finishTime);
         m_identifierForLoadWithoutResourceLoader = 0;
     }
 
-    maybeFinishLoadingMultipartContent();
-
     double responseEndTime = finishTime;
     if (!responseEndTime)
         responseEndTime = m_timeOfLastDataReceived;
     if (!responseEndTime)
         responseEndTime = monotonicallyIncreasingTime();
     timing()->setResponseEnd(responseEndTime);
 
     commitIfReady();
     if (!frameLoader())
         return;
@@ skipping 211 matching lines @@
 
             // The load event might have detached this frame. In that case, the load will already have been cancelled during detach.
             if (frameLoader())
                 cancelMainResourceLoad(frameLoader()->cancelledError(m_request));
             return;
         }
     }
 
     ASSERT(!mainResourceLoader() || !mainResourceLoader()->defersLoading());
 
-    if (m_isLoadingMultipartContent) {
-        setupForReplace();
-        m_mainResource->clear();
-    } else if (response.isMultipart()) {
-        UseCounter::count(m_frame->document(), UseCounter::MultipartMainResource);
-        m_isLoadingMultipartContent = true;
-    }
-
     m_response = response;
 
     if (m_identifierForLoadWithoutResourceLoader)
         frameLoader()->notifier()->dispatchDidReceiveResponse(this, m_identifierForLoadWithoutResourceLoader, m_response, 0);
 
     if (!shouldContinueForResponse()) {
         InspectorInstrumentation::continueWithPolicyIgnore(m_frame, this, m_mainResource->identifier(), m_response);
         stopLoadingForPolicyChange();
         return;
     }
@@ skipping 61 matching lines @@
         m_writer.setDocumentWasLoadedAsPartOfNavigation();
 
         if (frameLoader()->stateMachine()->creatingInitialEmptyDocument())
             return;
         
         // The origin is the MHTML file, we need to set the base URL to the document encoded in the MHTML so
         // relative URLs are resolved properly.
         if (m_archive)
             m_frame->document()->setBaseURLOverride(m_archive->mainResource()->url());
 
-        // Call receivedFirstData() exactly once per load. We should only reach this point multiple times
-        // for multipart loads, and FrameLoader::isReplacing() will be true after the first time.
-        if (!isMultipartReplacingLoad())
-            frameLoader()->receivedFirstData();
+        // Call receivedFirstData() exactly once per load.
+        frameLoader()->receivedFirstData();
 
         bool userChosen = true;
         String encoding = overrideEncoding();
         if (encoding.isNull()) {
             userChosen = false;
             encoding = response().textEncodingName();
         }
         m_writer.setEncoding(encoding, userChosen);
     }
     ASSERT(m_frame->document()->parsing());
@@ skipping 27 matching lines @@
     ASSERT_UNUSED(resource, resource == m_mainResource);
     ASSERT(!m_response.isNull());
     ASSERT(!mainResourceLoader() || !mainResourceLoader()->defersLoading());
 
     if (m_identifierForLoadWithoutResourceLoader)
         frameLoader()->notifier()->dispatchDidReceiveData(this, m_identifierForLoadWithoutResourceLoader, data, length, -1);
 
     m_applicationCacheHost->mainResourceDataReceived(data, length);
     m_timeOfLastDataReceived = monotonicallyIncreasingTime();
 
-    if (!isMultipartReplacingLoad())
-        commitLoad(data, length);
-}
-
-void DocumentLoader::setupForReplace()
-{
-    if (!mainResourceData())
-        return;
-    
-    maybeFinishLoadingMultipartContent();
-    maybeCreateArchive();
-    m_writer.end();
-    frameLoader()->setReplacing();
-    m_gotFirstByte = false;
-    
-    stopLoadingSubresources();
-    clearArchiveResources();
+    commitLoad(data, length);
 }
 
 void DocumentLoader::checkLoadComplete()
 {
     if (!m_frame || isLoading())
         return;
     // FIXME: This ASSERT is always triggered.
     // See https://bugs.webkit.org/show_bug.cgi?id=110937
     // ASSERT(this == frameLoader()->activeDocumentLoader())
     m_frame->document()->domWindow()->finishedLoading();
@@ skipping 204 matching lines @@
 void DocumentLoader::removeResourceLoader(ResourceLoader* loader)
 {
     if (!m_resourceLoaders.contains(loader))
         return;
     m_resourceLoaders.remove(loader);
     checkLoadComplete();
     if (Frame* frame = m_frame)
         frame->loader()->checkLoadComplete();
 }
 
-bool DocumentLoader::isMultipartReplacingLoad() const
-{
-    return isLoadingMultipartContent() && frameLoader()->isReplacing();
-}
-
 bool DocumentLoader::maybeLoadEmpty()
 {
     bool shouldLoadEmpty = !m_substituteData.isValid() && (m_request.url().isEmpty() || SchemeRegistry::shouldLoadURLSchemeAsEmptyDocument(m_request.url().protocol()));
     if (!shouldLoadEmpty)
         return false;
 
     if (m_request.url().isEmpty() && !frameLoader()->stateMachine()->creatingInitialEmptyDocument())
         m_request.setURL(blankURL());
     String mimeType = shouldLoadEmpty ? "text/html" : frameLoader()->client()->generatedMIMETypeForURLScheme(m_request.url().protocol());
     m_response = ResourceResponse(m_request.url(), mimeType, 0, String(), String());
@@ skipping 71 matching lines @@
 
 void DocumentLoader::subresourceLoaderFinishedLoadingOnePart(ResourceLoader* loader)
 {
     m_multipartResourceLoaders.add(loader);
     m_resourceLoaders.remove(loader);
     checkLoadComplete();
     if (Frame* frame = m_frame)
         frame->loader()->checkLoadComplete();    
 }
 
-void DocumentLoader::maybeFinishLoadingMultipartContent()
-{
-    if (!isMultipartReplacingLoad())
-        return;
-
-    frameLoader()->setupForReplace();
-    m_committed = false;
-    RefPtr<SharedBuffer> resourceData = mainResourceData();
-    commitLoad(resourceData->data(), resourceData->size());
-}
-
 void DocumentLoader::handledOnloadEvents()
 {
     m_wasOnloadHandled = true;
     applicationCacheHost()->stopDeferringEvents();
 }
 
 } // namespace WebCore