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

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

Issue 120513004: Don't expose DocumentWriter to embedding layer (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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
« no previous file with comments | « Source/core/loader/DocumentLoader.h ('k') | Source/core/loader/SubstituteData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/DocumentLoader.cpp
diff --git a/Source/core/loader/DocumentLoader.cpp b/Source/core/loader/DocumentLoader.cpp
index 1fd35bab432dbc6d12c19c26f5c75632cbd8ce07..edde0b72535c9fb97cbfb33bed94ebc241a56d65 100644
--- a/Source/core/loader/DocumentLoader.cpp
+++ b/Source/core/loader/DocumentLoader.cpp
@@ -157,25 +157,6 @@ bool DocumentLoader::isURLValidForNewHistoryEntry() const
return !originalRequest().url().isEmpty() || !unreachableURL().isEmpty();
}
-void DocumentLoader::setRequest(const ResourceRequest& req)
-{
- // Replacing an unreachable URL with alternate content looks like a server-side
- // redirect at this point, but we can replace a committed dataSource.
- bool handlingUnreachableURL = false;
-
- handlingUnreachableURL = m_substituteData.isValid() && !m_substituteData.failingURL().isEmpty();
-
- if (handlingUnreachableURL)
- m_committed = false;
-
- // We should never be getting a redirect callback after the data
- // source is committed, except in the unreachable URL case. It
- // would be a WebFoundation bug if it sent a redirect callback after commit.
- ASSERT(!m_committed);
-
- m_request = req;
-}
-
void DocumentLoader::setMainDocumentError(const ResourceError& error)
{
m_mainDocumentError = error;
@@ -324,11 +305,7 @@ bool DocumentLoader::isRedirectAfterPost(const ResourceRequest& newRequest, cons
bool DocumentLoader::shouldContinueForNavigationPolicy(const ResourceRequest& request, PolicyCheckLoadType policyCheckLoadType)
{
// Don't ask if we are loading an empty URL.
- if (request.url().isEmpty())
- return true;
-
- // We are always willing to show alternate content for unreachable URLs.
- if (m_substituteData.isValid() && !m_substituteData.failingURL().isEmpty())
+ if (request.url().isEmpty() || m_substituteData.isValid())
return true;
// If we're loading content into a subframe, check against the parent's Content Security Policy
@@ -404,7 +381,7 @@ void DocumentLoader::willSendRequest(ResourceRequest& newRequest, const Resource
}
}
- setRequest(newRequest);
+ m_request = newRequest;
if (redirectResponse.isNull())
return;
@@ -795,7 +772,7 @@ void DocumentLoader::startLoadingMainResource()
FetchRequest cachedResourceRequest(request, FetchInitiatorTypeNames::document, mainResourceLoadOptions);
m_mainResource = m_fetcher->fetchMainResource(cachedResourceRequest, m_substituteData);
if (!m_mainResource) {
- setRequest(ResourceRequest());
+ m_request = ResourceRequest();
// If the load was aborted by clearing m_request, it's possible the ApplicationCacheHost
// is now in a state where starting an empty load will be inconsistent. Replace it with
// a new ApplicationCacheHost.
@@ -812,7 +789,7 @@ void DocumentLoader::startLoadingMainResource()
// the fragment identifier, so add that back in.
if (equalIgnoringFragmentIdentifier(m_request.url(), request.url()))
request.setURL(m_request.url());
- setRequest(request);
+ m_request = request;
}
void DocumentLoader::cancelMainResourceLoad(const ResourceError& resourceError)
@@ -826,12 +803,6 @@ void DocumentLoader::cancelMainResourceLoad(const ResourceError& resourceError)
mainReceivedError(error);
}
-DocumentWriter* DocumentLoader::beginWriting(const AtomicString& mimeType, const AtomicString& encoding, const KURL& url)
-{
- m_writer = createWriterFor(m_frame, 0, url, mimeType, encoding, false, true);
- return m_writer.get();
-}
-
void DocumentLoader::endWriting(DocumentWriter* writer)
{
ASSERT_UNUSED(writer, m_writer == writer);
« no previous file with comments | « Source/core/loader/DocumentLoader.h ('k') | Source/core/loader/SubstituteData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698