Index: Source/core/history/HistoryItem.cpp |
diff --git a/Source/core/history/HistoryItem.cpp b/Source/core/history/HistoryItem.cpp |
index 4d78900ae60d987331fcd03386d3be4a2e440b22..a26929a2865c2b753302e59bed146aea84905be7 100644 |
--- a/Source/core/history/HistoryItem.cpp |
+++ b/Source/core/history/HistoryItem.cpp |
@@ -86,14 +86,14 @@ void HistoryItem::reset() |
{ |
m_urlString = String(); |
m_originalURLString = String(); |
- m_referrer = String(); |
+ m_referrer = nullAtom; |
m_target = String(); |
m_itemSequenceNumber = generateSequenceNumber(); |
m_stateObject = 0; |
m_documentSequenceNumber = generateSequenceNumber(); |
m_targetFrameID = 0; |
m_formData = 0; |
- m_formContentType = String(); |
+ m_formContentType = nullAtom; |
clearChildren(); |
} |
@@ -119,7 +119,7 @@ KURL HistoryItem::originalURL() const |
return KURL(ParsedURLString, m_originalURLString); |
} |
-const String& HistoryItem::referrer() const |
+const AtomicString& HistoryItem::referrer() const |
{ |
return m_referrer; |
} |
@@ -146,7 +146,7 @@ void HistoryItem::setOriginalURLString(const String& urlString) |
m_originalURLString = urlString; |
} |
-void HistoryItem::setReferrer(const String& referrer) |
+void HistoryItem::setReferrer(const AtomicString& referrer) |
{ |
m_referrer = referrer; |
} |
@@ -217,7 +217,7 @@ void HistoryItem::clearChildren() |
m_children.clear(); |
} |
-String HistoryItem::formContentType() const |
+const AtomicString& HistoryItem::formContentType() const |
{ |
return m_formContentType; |
} |
@@ -233,7 +233,7 @@ void HistoryItem::setFormInfoFromRequest(const ResourceRequest& request) |
m_formContentType = request.httpContentType(); |
} else { |
m_formData = 0; |
- m_formContentType = String(); |
+ m_formContentType = nullAtom; |
} |
} |
@@ -242,7 +242,7 @@ void HistoryItem::setFormData(PassRefPtr<FormData> formData) |
m_formData = formData; |
} |
-void HistoryItem::setFormContentType(const String& formContentType) |
+void HistoryItem::setFormContentType(const AtomicString& formContentType) |
{ |
m_formContentType = formContentType; |
} |