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 | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
9 * rights reserved. | 9 * rights reserved. |
10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
379 m_loader.load(request); | 379 m_loader.load(request); |
380 } | 380 } |
381 | 381 |
382 void LocalFrame::reload(FrameLoadType loadType, | 382 void LocalFrame::reload(FrameLoadType loadType, |
383 ClientRedirectPolicy clientRedirectPolicy) { | 383 ClientRedirectPolicy clientRedirectPolicy) { |
384 DCHECK(isReloadLoadType(loadType)); | 384 DCHECK(isReloadLoadType(loadType)); |
385 if (clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect) { | 385 if (clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect) { |
386 if (!m_loader.currentItem()) | 386 if (!m_loader.currentItem()) |
387 return; | 387 return; |
388 FrameLoadRequest request = | 388 FrameLoadRequest request = |
389 FrameLoadRequest(nullptr, m_loader.resourceRequestForReload( | 389 FrameLoadRequest(nullptr, |
390 loadType, KURL(), clientRedirectPolicy)); | 390 m_loader.resourceRequestForReload( |
| 391 loadType, KURL(), clientRedirectPolicy)); |
391 request.setClientRedirect(clientRedirectPolicy); | 392 request.setClientRedirect(clientRedirectPolicy); |
392 m_loader.load(request, loadType); | 393 m_loader.load(request, loadType); |
393 } else { | 394 } else { |
394 if (RuntimeEnabledFeatures::fasterLocationReloadEnabled()) | 395 if (RuntimeEnabledFeatures::fasterLocationReloadEnabled()) |
395 DCHECK_EQ(FrameLoadTypeReloadMainResource, loadType); | 396 DCHECK_EQ(FrameLoadTypeReloadMainResource, loadType); |
396 else | 397 else |
397 DCHECK_EQ(FrameLoadTypeReload, loadType); | 398 DCHECK_EQ(FrameLoadTypeReload, loadType); |
398 m_navigationScheduler->scheduleReload(); | 399 m_navigationScheduler->scheduleReload(); |
399 } | 400 } |
400 } | 401 } |
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
917 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 918 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
918 m_frame->client()->frameBlameContext()->Enter(); | 919 m_frame->client()->frameBlameContext()->Enter(); |
919 } | 920 } |
920 | 921 |
921 ScopedFrameBlamer::~ScopedFrameBlamer() { | 922 ScopedFrameBlamer::~ScopedFrameBlamer() { |
922 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 923 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
923 m_frame->client()->frameBlameContext()->Leave(); | 924 m_frame->client()->frameBlameContext()->Leave(); |
924 } | 925 } |
925 | 926 |
926 } // namespace blink | 927 } // namespace blink |
OLD | NEW |