Simplify starting a navigation

third_party/WebKit/Source/core/fetch/Resource.cpp

Index: third_party/WebKit/Source/core/fetch/Resource.cpp
diff --git a/third_party/WebKit/Source/core/fetch/Resource.cpp b/third_party/WebKit/Source/core/fetch/Resource.cpp
index aade7d714ec9492a3d1384bb3df6da8705d75448..de290b6cc35a6645888f99249d5ea2ed02d9bfd0 100644
--- a/third_party/WebKit/Source/core/fetch/Resource.cpp
+++ b/third_party/WebKit/Source/core/fetch/Resource.cpp
@@ -175,13 +175,8 @@ Resource::Resource(const ResourceRequest& request, Type type)
     if (m_resourceRequest.url().protocolIsInHTTPFamily())
         m_cacheHandler = CacheHandler::create(this);
 
-    if (!m_resourceRequest.url().hasFragmentIdentifier())
-        return;
-    KURL urlForCache = MemoryCache::removeFragmentIdentifierIfNeeded(m_resourceRequest.url());
-    if (urlForCache.hasFragmentIdentifier())
-        return;
-    m_fragmentIdentifierForRequest = m_resourceRequest.url().fragmentIdentifier();
-    m_resourceRequest.setURL(urlForCache);
+    if (!accept().isEmpty())
+        m_resourceRequest.setHTTPAccept(accept());
 }
 
 Resource::~Resource()
@@ -213,28 +208,23 @@ void Resource::load(ResourceFetcher* fetcher, const ResourceLoaderOptions& optio
 {
     m_options = options;
     m_loading = true;
-
-    ResourceRequest request(m_revalidatingRequest.isNull() ? m_resourceRequest : m_revalidatingRequest);
-    if (!accept().isEmpty())
-        request.setHTTPAccept(accept());
-
-    // FIXME: It's unfortunate that the cache layer and below get to know anything about fragment identifiers.

[Nate Chapin, 2015/11/04 22:13:09]

I remember adding this hack :(

It's relatively straightforward to remove after the repo merge, so doing so.
It's actually only two chromium tests that break, one of which has its
expectations change, and one is fixed with a DocumentLoader.cpp change.

-    // We should look into removing the expectation of that knowledge from the platform network stacks.
-    if (!m_fragmentIdentifierForRequest.isNull()) {
-        KURL url = request.url();
-        url.setFragmentIdentifier(m_fragmentIdentifierForRequest);
-        request.setURL(url);
-        m_fragmentIdentifierForRequest = String();
-    }
     m_status = Pending;
+
     if (m_loader) {
         ASSERT(m_revalidatingRequest.isNull());
         RELEASE_ASSERT(m_options.synchronousPolicy == RequestSynchronously);
         m_loader->changeToSynchronous();
         return;
     }
-    m_loader = ResourceLoader::create(fetcher, this, request, options);
+
+    ResourceRequest& request(m_revalidatingRequest.isNull() ? m_resourceRequest : m_revalidatingRequest);
+    ResourceRequest requestCopy(m_revalidatingRequest.isNull() ? m_resourceRequest : m_revalidatingRequest);
+    m_loader = ResourceLoader::create(fetcher, this, requestCopy, options);
     m_loader->start();
+
+    // Headers might have been modified during load start. Copy them over so long as the url didn't change.
+    if (request.url() == requestCopy.url())

[Nate Chapin, 2015/11/04 22:13:09]

This is a little goofy, and requires passing a non-const reference to
ResourceLoader::create, but I think it's the least wacky way to make sure
everyone gets the final headers for a non-redirect request.

+        request = requestCopy;
 }
 
 void Resource::checkNotify()