Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1133)

Unified Diff: Source/core/loader/FrameLoader.cpp

Issue 16140020: Delete NetworkingContext and its subclasses. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/loader/FrameLoader.cpp
diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
index a8209d998ae340dd1114233c115fe46d9d53078b..844fcb43af8a4990de450daf9ac9c46dbd310e1d 100644
--- a/Source/core/loader/FrameLoader.cpp
+++ b/Source/core/loader/FrameLoader.cpp
@@ -73,7 +73,6 @@
#include "core/loader/FormSubmission.h"
#include "core/loader/FrameLoadRequest.h"
#include "core/loader/FrameLoaderClient.h"
-#include "core/loader/FrameNetworkingContext.h"
#include "core/loader/ProgressTracker.h"
#include "core/loader/TextResourceDecoder.h"
#include "core/loader/UniqueIdentifier.h"
@@ -213,9 +212,6 @@ FrameLoader::~FrameLoader()
(*it)->loader()->m_opener = 0;
m_client->frameLoaderDestroyed();
-
- if (m_networkingContext)
- m_networkingContext->invalidate();
}
void FrameLoader::init()
@@ -226,8 +222,6 @@ void FrameLoader::init()
m_provisionalDocumentLoader->startLoadingMainResource();
m_frame->document()->cancelParsing();
m_stateMachine.advanceTo(FrameLoaderStateMachine::DisplayingInitialEmptyDocument);
-
- m_networkingContext = m_client->createNetworkingContext();
m_progressTracker = FrameProgressTracker::create(m_frame);
}
@@ -1901,7 +1895,7 @@ unsigned long FrameLoader::loadResourceSynchronously(const ResourceRequest& requ
if (error.isNull()) {
ASSERT(!newRequest.isNull());
documentLoader()->applicationCacheHost()->willStartLoadingSynchronously(newRequest);
- ResourceHandle::loadResourceSynchronously(networkingContext(), newRequest, storedCredentials, error, response, data);
+ ResourceHandle::loadResourceSynchronously(newRequest, storedCredentials, error, response, data);
}
int encodedDataLength = response.resourceLoadInfo() ? static_cast<int>(response.resourceLoadInfo()->encodedDataLength) : -1;
notifier()->sendRemainingDelegateMessages(m_documentLoader.get(), identifier, response, data.data(), data.size(), encodedDataLength, error);
@@ -2493,11 +2487,6 @@ void FrameLoader::tellClientAboutPastMemoryCacheLoads()
}
}
-NetworkingContext* FrameLoader::networkingContext() const
-{
- return m_networkingContext.get();
-}
-
void FrameLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
{
MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader);
@@ -2512,7 +2501,6 @@ void FrameLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
info.addMember(m_opener, "opener");
info.addMember(m_openedFrames, "openedFrames");
info.addMember(m_outgoingReferrer, "outgoingReferrer");
- info.addMember(m_networkingContext, "networkingContext");
info.addMember(m_requestedHistoryItem, "requestedHistoryItem");
}

Powered by Google App Engine
This is Rietveld 408576698