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