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 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
378 DCHECK(isReloadLoadType(loadType)); | 378 DCHECK(isReloadLoadType(loadType)); |
379 if (clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect) { | 379 if (clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect) { |
380 if (!m_loader.currentItem()) | 380 if (!m_loader.currentItem()) |
381 return; | 381 return; |
382 FrameLoadRequest request = | 382 FrameLoadRequest request = |
383 FrameLoadRequest(nullptr, m_loader.resourceRequestForReload( | 383 FrameLoadRequest(nullptr, m_loader.resourceRequestForReload( |
384 loadType, KURL(), clientRedirectPolicy)); | 384 loadType, KURL(), clientRedirectPolicy)); |
385 request.setClientRedirect(clientRedirectPolicy); | 385 request.setClientRedirect(clientRedirectPolicy); |
386 m_loader.load(request, loadType); | 386 m_loader.load(request, loadType); |
387 } else { | 387 } else { |
388 DCHECK_EQ(FrameLoadTypeReloadMainResource, loadType); | 388 DCHECK_EQ(FrameLoadTypeReload, loadType); |
389 m_navigationScheduler->scheduleReload(); | 389 m_navigationScheduler->scheduleReload(); |
390 } | 390 } |
391 } | 391 } |
392 | 392 |
393 void LocalFrame::detach(FrameDetachType type) { | 393 void LocalFrame::detach(FrameDetachType type) { |
394 // Note that detach() can be re-entered, so it's not possible to | 394 // Note that detach() can be re-entered, so it's not possible to |
395 // DCHECK(!m_isDetaching) here. | 395 // DCHECK(!m_isDetaching) here. |
396 m_isDetaching = true; | 396 m_isDetaching = true; |
397 | 397 |
398 if (isLocalRoot()) | 398 if (isLocalRoot()) |
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
913 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 913 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
914 m_frame->client()->frameBlameContext()->Enter(); | 914 m_frame->client()->frameBlameContext()->Enter(); |
915 } | 915 } |
916 | 916 |
917 ScopedFrameBlamer::~ScopedFrameBlamer() { | 917 ScopedFrameBlamer::~ScopedFrameBlamer() { |
918 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 918 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
919 m_frame->client()->frameBlameContext()->Leave(); | 919 m_frame->client()->frameBlameContext()->Leave(); |
920 } | 920 } |
921 | 921 |
922 } // namespace blink | 922 } // namespace blink |
OLD | NEW |