| Index: Source/core/loader/FrameLoader.cpp
|
| diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
|
| index af1c3fd08222fb815d4215e5db97f07697236d5e..9778420dad8c95a249dcd5cb643be3f84cd62655 100644
|
| --- a/Source/core/loader/FrameLoader.cpp
|
| +++ b/Source/core/loader/FrameLoader.cpp
|
| @@ -562,7 +562,7 @@ void FrameLoader::updateForSameDocumentNavigation(const KURL& newURL, SameDocume
|
| if (sameDocumentNavigationSource != SameDocumentNavigationDefault) {
|
| m_currentItem->setStateObject(data);
|
| m_currentItem->setFormData(0);
|
| - m_currentItem->setFormContentType(String());
|
| + m_currentItem->setFormContentType(nullAtom);
|
| }
|
| }
|
|
|
| @@ -1173,10 +1173,10 @@ void FrameLoader::addExtraFieldsToRequest(ResourceRequest& request)
|
| request.setHTTPAccept(defaultAcceptHeader);
|
|
|
| // Make sure we send the Origin header.
|
| - addHTTPOriginIfNeeded(request, String());
|
| + addHTTPOriginIfNeeded(request, nullAtom);
|
| }
|
|
|
| -void FrameLoader::addHTTPOriginIfNeeded(ResourceRequest& request, const String& origin)
|
| +void FrameLoader::addHTTPOriginIfNeeded(ResourceRequest& request, const AtomicString& origin)
|
| {
|
| if (!request.httpOrigin().isEmpty())
|
| return; // Request already has an Origin header.
|
|
|