| OLD | NEW |
| 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 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 | 294 |
| 295 void LocalFrame::navigate(const FrameLoadRequest& request) | 295 void LocalFrame::navigate(const FrameLoadRequest& request) |
| 296 { | 296 { |
| 297 if (!isNavigationAllowed()) | 297 if (!isNavigationAllowed()) |
| 298 return; | 298 return; |
| 299 m_loader.load(request); | 299 m_loader.load(request); |
| 300 } | 300 } |
| 301 | 301 |
| 302 void LocalFrame::reload(FrameLoadType loadType, ClientRedirectPolicy clientRedir
ectPolicy) | 302 void LocalFrame::reload(FrameLoadType loadType, ClientRedirectPolicy clientRedir
ectPolicy) |
| 303 { | 303 { |
| 304 ASSERT(loadType == FrameLoadTypeReload || loadType == FrameLoadTypeReloadFro
mOrigin); | 304 ASSERT(loadType == FrameLoadTypeReload || loadType == FrameLoadTypeReloadByp
assingCache); |
| 305 ASSERT(clientRedirectPolicy == NotClientRedirect || loadType == FrameLoadTyp
eReload); | 305 ASSERT(clientRedirectPolicy == NotClientRedirect || loadType == FrameLoadTyp
eReload); |
| 306 if (clientRedirectPolicy == NotClientRedirect) { | 306 if (clientRedirectPolicy == NotClientRedirect) { |
| 307 if (!m_loader.currentItem()) | 307 if (!m_loader.currentItem()) |
| 308 return; | 308 return; |
| 309 FrameLoadRequest request = FrameLoadRequest( | 309 FrameLoadRequest request = FrameLoadRequest( |
| 310 nullptr, m_loader.resourceRequestForReload(loadType, KURL(), clientR
edirectPolicy)); | 310 nullptr, m_loader.resourceRequestForReload(loadType, KURL(), clientR
edirectPolicy)); |
| 311 request.setClientRedirect(clientRedirectPolicy); | 311 request.setClientRedirect(clientRedirectPolicy); |
| 312 m_loader.load(request, loadType); | 312 m_loader.load(request, loadType); |
| 313 } else { | 313 } else { |
| 314 m_navigationScheduler->scheduleReload(); | 314 m_navigationScheduler->scheduleReload(); |
| (...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 873 { | 873 { |
| 874 m_frame->disableNavigation(); | 874 m_frame->disableNavigation(); |
| 875 } | 875 } |
| 876 | 876 |
| 877 FrameNavigationDisabler::~FrameNavigationDisabler() | 877 FrameNavigationDisabler::~FrameNavigationDisabler() |
| 878 { | 878 { |
| 879 m_frame->enableNavigation(); | 879 m_frame->enableNavigation(); |
| 880 } | 880 } |
| 881 | 881 |
| 882 } // namespace blink | 882 } // namespace blink |
| OLD | NEW |