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

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

Issue 1232223002: Rename LockBackForwardList to ReplaceCurrentItem. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 5 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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 DOMWindow* LocalFrame::domWindow() const 226 DOMWindow* LocalFrame::domWindow() const
227 { 227 {
228 return m_domWindow.get(); 228 return m_domWindow.get();
229 } 229 }
230 230
231 WindowProxy* LocalFrame::windowProxy(DOMWrapperWorld& world) 231 WindowProxy* LocalFrame::windowProxy(DOMWrapperWorld& world)
232 { 232 {
233 return m_script->windowProxy(world); 233 return m_script->windowProxy(world);
234 } 234 }
235 235
236 void LocalFrame::navigate(Document& originDocument, const KURL& url, bool lockBa ckForwardList, UserGestureStatus userGestureStatus) 236 void LocalFrame::navigate(Document& originDocument, const KURL& url, bool replac eCurrentItem, UserGestureStatus userGestureStatus)
237 { 237 {
238 // TODO(dcheng): Special case for window.open("about:blank") to ensure it lo ads synchronously into 238 // TODO(dcheng): Special case for window.open("about:blank") to ensure it lo ads synchronously into
239 // a new window. This is our historical behavior, and it's consistent with t he creation of 239 // a new window. This is our historical behavior, and it's consistent with t he creation of
240 // a new iframe with src="about:blank". Perhaps we could get rid of this if we started reporting 240 // a new iframe with src="about:blank". Perhaps we could get rid of this if we started reporting
241 // the initial empty document's url as about:blank? See crbug.com/471239. 241 // the initial empty document's url as about:blank? See crbug.com/471239.
242 // TODO(japhet): This special case is also necessary for behavior asserted b y some extensions tests. 242 // TODO(japhet): This special case is also necessary for behavior asserted b y some extensions tests.
243 // Using NavigationScheduler::scheduleNavigationChange causes the navigation to be flagged as a 243 // Using NavigationScheduler::scheduleNavigationChange causes the navigation to be flagged as a
244 // client redirect, which is observable via the webNavigation extension api. 244 // client redirect, which is observable via the webNavigation extension api.
245 if (isMainFrame() && !m_loader.stateMachine()->committedFirstRealDocumentLoa d()) { 245 if (isMainFrame() && !m_loader.stateMachine()->committedFirstRealDocumentLoa d()) {
246 FrameLoadRequest request(&originDocument, url); 246 FrameLoadRequest request(&originDocument, url);
247 request.resourceRequest().setHasUserGesture(userGestureStatus == UserGes tureStatus::Active); 247 request.resourceRequest().setHasUserGesture(userGestureStatus == UserGes tureStatus::Active);
248 m_loader.load(request); 248 m_loader.load(request);
249 } else { 249 } else {
250 m_navigationScheduler.scheduleLocationChange(&originDocument, url.string (), lockBackForwardList); 250 m_navigationScheduler.scheduleLocationChange(&originDocument, url.string (), replaceCurrentItem);
251 } 251 }
252 } 252 }
253 253
254 void LocalFrame::navigate(const FrameLoadRequest& request) 254 void LocalFrame::navigate(const FrameLoadRequest& request)
255 { 255 {
256 m_loader.load(request); 256 m_loader.load(request);
257 } 257 }
258 258
259 void LocalFrame::reload(FrameLoadType loadType, ClientRedirectPolicy clientRedir ectPolicy) 259 void LocalFrame::reload(FrameLoadType loadType, ClientRedirectPolicy clientRedir ectPolicy)
260 { 260 {
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
844 { 844 {
845 if (isLocalRoot()) 845 if (isLocalRoot())
846 m_instrumentingAgents = InstrumentingAgents::create(); 846 m_instrumentingAgents = InstrumentingAgents::create();
847 else 847 else
848 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; 848 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents;
849 } 849 }
850 850
851 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); 851 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame);
852 852
853 } // namespace blink 853 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698