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

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

Issue 123003002: Make calls to AtomicString(const String&) explicit in loader/ and fetch/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 12 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/FrameLoader.cpp ('k') | Source/core/loader/PingLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/NavigationScheduler.cpp
diff --git a/Source/core/loader/NavigationScheduler.cpp b/Source/core/loader/NavigationScheduler.cpp
index e47437cc84249de53c976772b3c9b3e417d65dd6..fa38aae82c4bfe6c5ad1fd7063338555b02d4a98 100644
--- a/Source/core/loader/NavigationScheduler.cpp
+++ b/Source/core/loader/NavigationScheduler.cpp
@@ -96,7 +96,7 @@ private:
class ScheduledURLNavigation : public ScheduledNavigation {
protected:
- ScheduledURLNavigation(double delay, Document* originDocument, const String& url, const String& referrer, bool lockBackForwardList, bool isLocationChange)
+ ScheduledURLNavigation(double delay, Document* originDocument, const String& url, const AtomicString& referrer, bool lockBackForwardList, bool isLocationChange)
: ScheduledNavigation(delay, lockBackForwardList, isLocationChange)
, m_originDocument(originDocument)
, m_url(url)
@@ -115,18 +115,18 @@ protected:
Document* originDocument() const { return m_originDocument.get(); }
String url() const { return m_url; }
- String referrer() const { return m_referrer; }
+ const AtomicString& referrer() const { return m_referrer; }
private:
RefPtr<Document> m_originDocument;
String m_url;
- String m_referrer;
+ AtomicString m_referrer;
};
class ScheduledRedirect : public ScheduledURLNavigation {
public:
ScheduledRedirect(double delay, Document* originDocument, const String& url, bool lockBackForwardList)
- : ScheduledURLNavigation(delay, originDocument, url, String(), lockBackForwardList, false)
+ : ScheduledURLNavigation(delay, originDocument, url, nullAtom, lockBackForwardList, false)
{
clearUserGesture();
}
@@ -147,13 +147,13 @@ public:
class ScheduledLocationChange : public ScheduledURLNavigation {
public:
- ScheduledLocationChange(Document* originDocument, const String& url, const String& referrer, bool lockBackForwardList)
+ ScheduledLocationChange(Document* originDocument, const String& url, const AtomicString& referrer, bool lockBackForwardList)
: ScheduledURLNavigation(0.0, originDocument, url, referrer, lockBackForwardList, true) { }
};
class ScheduledRefresh : public ScheduledURLNavigation {
public:
- ScheduledRefresh(Document* originDocument, const String& url, const String& referrer)
+ ScheduledRefresh(Document* originDocument, const String& url, const AtomicString& referrer)
: ScheduledURLNavigation(0.0, originDocument, url, referrer, true, true)
{
}
@@ -308,7 +308,7 @@ void NavigationScheduler::scheduleLocationChange(Document* originDocument, const
if (originDocument->securityOrigin()->canAccess(m_frame->document()->securityOrigin())) {
KURL parsedURL(ParsedURLString, url);
if (parsedURL.hasFragmentIdentifier() && equalIgnoringFragmentIdentifier(m_frame->document()->url(), parsedURL)) {
- FrameLoadRequest request(originDocument, ResourceRequest(m_frame->document()->completeURL(url), referrer), "_self");
+ FrameLoadRequest request(originDocument, ResourceRequest(m_frame->document()->completeURL(url), AtomicString(referrer)), "_self");
request.setLockBackForwardList(lockBackForwardList);
request.setClientRedirect(ClientRedirect);
m_frame->loader().load(request);
@@ -316,7 +316,7 @@ void NavigationScheduler::scheduleLocationChange(Document* originDocument, const
}
}
- schedule(adoptPtr(new ScheduledLocationChange(originDocument, url, referrer, lockBackForwardList)));
+ schedule(adoptPtr(new ScheduledLocationChange(originDocument, url, AtomicString(referrer), lockBackForwardList)));
}
void NavigationScheduler::scheduleFormSubmission(PassRefPtr<FormSubmission> submission)
@@ -333,7 +333,7 @@ void NavigationScheduler::scheduleRefresh()
if (url.isEmpty())
return;
- schedule(adoptPtr(new ScheduledRefresh(m_frame->document(), url.string(), m_frame->document()->outgoingReferrer())));
+ schedule(adoptPtr(new ScheduledRefresh(m_frame->document(), url.string(), AtomicString(m_frame->document()->outgoingReferrer()))));
}
void NavigationScheduler::scheduleHistoryNavigation(int steps)
« no previous file with comments | « Source/core/loader/FrameLoader.cpp ('k') | Source/core/loader/PingLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698