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

Side by Side Diff: Source/core/frame/History.cpp

Issue 32793003: Have Frame::navigationScheduler() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/Frame.h ('k') | Source/core/frame/Location.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 void History::forward(ExecutionContext* context) 104 void History::forward(ExecutionContext* context)
105 { 105 {
106 go(context, 1); 106 go(context, 1);
107 } 107 }
108 108
109 void History::go(int distance) 109 void History::go(int distance)
110 { 110 {
111 if (!m_frame) 111 if (!m_frame)
112 return; 112 return;
113 113
114 m_frame->navigationScheduler()->scheduleHistoryNavigation(distance); 114 m_frame->navigationScheduler().scheduleHistoryNavigation(distance);
115 } 115 }
116 116
117 void History::go(ExecutionContext* context, int distance) 117 void History::go(ExecutionContext* context, int distance)
118 { 118 {
119 if (!m_frame) 119 if (!m_frame)
120 return; 120 return;
121 121
122 ASSERT(isMainThread()); 122 ASSERT(isMainThread());
123 Document* activeDocument = toDocument(context); 123 Document* activeDocument = toDocument(context);
124 if (!activeDocument) 124 if (!activeDocument)
125 return; 125 return;
126 126
127 if (!activeDocument->canNavigate(m_frame)) 127 if (!activeDocument->canNavigate(m_frame))
128 return; 128 return;
129 129
130 m_frame->navigationScheduler()->scheduleHistoryNavigation(distance); 130 m_frame->navigationScheduler().scheduleHistoryNavigation(distance);
131 } 131 }
132 132
133 KURL History::urlForState(const String& urlString) 133 KURL History::urlForState(const String& urlString)
134 { 134 {
135 Document* document = m_frame->document(); 135 Document* document = m_frame->document();
136 136
137 if (urlString.isNull()) 137 if (urlString.isNull())
138 return document->url(); 138 return document->url();
139 if (urlString.isEmpty()) 139 if (urlString.isEmpty())
140 return document->baseURL(); 140 return document->baseURL();
141 141
142 return KURL(document->baseURL(), urlString); 142 return KURL(document->baseURL(), urlString);
143 } 143 }
144 144
145 void History::stateObjectAdded(PassRefPtr<SerializedScriptValue> data, const Str ing& /* title */, const String& urlString, SameDocumentNavigationSource sameDocu mentNavigationSource, ExceptionState& es) 145 void History::stateObjectAdded(PassRefPtr<SerializedScriptValue> data, const Str ing& /* title */, const String& urlString, SameDocumentNavigationSource sameDocu mentNavigationSource, ExceptionState& es)
146 { 146 {
147 if (!m_frame || !m_frame->page()) 147 if (!m_frame || !m_frame->page())
148 return; 148 return;
149 149
150 KURL fullURL = urlForState(urlString); 150 KURL fullURL = urlForState(urlString);
151 if (!fullURL.isValid() || !m_frame->document()->securityOrigin()->canRequest (fullURL)) { 151 if (!fullURL.isValid() || !m_frame->document()->securityOrigin()->canRequest (fullURL)) {
152 // We can safely expose the URL to JavaScript, as a) no redirection take s place: JavaScript already had this URL, b) JavaScript can only access a same-o rigin History object. 152 // We can safely expose the URL to JavaScript, as a) no redirection take s place: JavaScript already had this URL, b) JavaScript can only access a same-o rigin History object.
153 es.throwSecurityError("A history state object with URL '" + fullURL.elid edString() + "' cannot be created in a document with origin '" + m_frame->docume nt()->securityOrigin()->toString() + "'."); 153 es.throwSecurityError("A history state object with URL '" + fullURL.elid edString() + "' cannot be created in a document with origin '" + m_frame->docume nt()->securityOrigin()->toString() + "'.");
154 return; 154 return;
155 } 155 }
156 m_frame->loader()->updateForSameDocumentNavigation(fullURL, sameDocumentNavi gationSource, data, FrameLoader::DoNotUpdateBackForwardList); 156 m_frame->loader()->updateForSameDocumentNavigation(fullURL, sameDocumentNavi gationSource, data, FrameLoader::DoNotUpdateBackForwardList);
157 } 157 }
158 158
159 } // namespace WebCore 159 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/Frame.h ('k') | Source/core/frame/Location.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698