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

Side by Side Diff: third_party/WebKit/Source/core/frame/Location.cpp

Issue 1843663005: Change bool ignoreCache to WebFrameLoadType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2010 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 return; 230 return;
231 setLocation(url, currentWindow, enteredWindow, &exceptionState, SetLocation: :ReplaceThisFrame); 231 setLocation(url, currentWindow, enteredWindow, &exceptionState, SetLocation: :ReplaceThisFrame);
232 } 232 }
233 233
234 void Location::reload(LocalDOMWindow* currentWindow) 234 void Location::reload(LocalDOMWindow* currentWindow)
235 { 235 {
236 if (!m_frame) 236 if (!m_frame)
237 return; 237 return;
238 if (protocolIsJavaScript(toLocalFrame(m_frame)->document()->url())) 238 if (protocolIsJavaScript(toLocalFrame(m_frame)->document()->url()))
239 return; 239 return;
240 m_frame->reload(FrameLoadTypeReload, ClientRedirect); 240 m_frame->reload(FrameLoadTypeReload, ClientRedirectPolicy::ClientRedirect);
241 } 241 }
242 242
243 void Location::setLocation(const String& url, LocalDOMWindow* currentWindow, Loc alDOMWindow* enteredWindow, ExceptionState* exceptionState, SetLocation location Policy) 243 void Location::setLocation(const String& url, LocalDOMWindow* currentWindow, Loc alDOMWindow* enteredWindow, ExceptionState* exceptionState, SetLocation location Policy)
244 { 244 {
245 ASSERT(m_frame); 245 ASSERT(m_frame);
246 if (!m_frame || !m_frame->host()) 246 if (!m_frame || !m_frame->host())
247 return; 247 return;
248 248
249 if (!currentWindow->frame() || !currentWindow->frame()->canNavigate(*m_frame )) 249 if (!currentWindow->frame() || !currentWindow->frame()->canNavigate(*m_frame ))
250 return; 250 return;
(...skipping 19 matching lines...) Expand all
270 argv.append("LocalDOMWindow"); 270 argv.append("LocalDOMWindow");
271 argv.append("url"); 271 argv.append("url");
272 argv.append(enteredDocument->url()); 272 argv.append(enteredDocument->url());
273 argv.append(completedURL); 273 argv.append(completedURL);
274 activityLogger->logEvent("blinkSetAttribute", argv.size(), argv.data()); 274 activityLogger->logEvent("blinkSetAttribute", argv.size(), argv.data());
275 } 275 }
276 m_frame->navigate(*currentWindow->document(), completedURL, locationPolicy = = SetLocation::ReplaceThisFrame, UserGestureStatus::None); 276 m_frame->navigate(*currentWindow->document(), completedURL, locationPolicy = = SetLocation::ReplaceThisFrame, UserGestureStatus::None);
277 } 277 }
278 278
279 } // namespace blink 279 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalFrame.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698