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 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
370 DCHECK(isReloadLoadType(loadType)); | 370 DCHECK(isReloadLoadType(loadType)); |
371 if (clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect) { | 371 if (clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect) { |
372 if (!m_loader.currentItem()) | 372 if (!m_loader.currentItem()) |
373 return; | 373 return; |
374 FrameLoadRequest request = | 374 FrameLoadRequest request = |
375 FrameLoadRequest(nullptr, m_loader.resourceRequestForReload( | 375 FrameLoadRequest(nullptr, m_loader.resourceRequestForReload( |
376 loadType, KURL(), clientRedirectPolicy)); | 376 loadType, KURL(), clientRedirectPolicy)); |
377 request.setClientRedirect(clientRedirectPolicy); | 377 request.setClientRedirect(clientRedirectPolicy); |
378 m_loader.load(request, loadType); | 378 m_loader.load(request, loadType); |
379 } else { | 379 } else { |
380 DCHECK_EQ(FrameLoadTypeReload, loadType); | 380 if (RuntimeEnabledFeatures::fasterLocationReloadEnabled()) |
| 381 DCHECK_EQ(FrameLoadTypeReloadMainResource, loadType); |
| 382 else |
| 383 DCHECK_EQ(FrameLoadTypeReload, loadType); |
381 m_navigationScheduler->scheduleReload(); | 384 m_navigationScheduler->scheduleReload(); |
382 } | 385 } |
383 } | 386 } |
384 | 387 |
385 void LocalFrame::detach(FrameDetachType type) { | 388 void LocalFrame::detach(FrameDetachType type) { |
386 // Note that detach() can be re-entered, so it's not possible to | 389 // Note that detach() can be re-entered, so it's not possible to |
387 // DCHECK(!m_isDetaching) here. | 390 // DCHECK(!m_isDetaching) here. |
388 m_isDetaching = true; | 391 m_isDetaching = true; |
389 | 392 |
390 if (isLocalRoot()) | 393 if (isLocalRoot()) |
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
929 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 932 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
930 m_frame->client()->frameBlameContext()->Enter(); | 933 m_frame->client()->frameBlameContext()->Enter(); |
931 } | 934 } |
932 | 935 |
933 ScopedFrameBlamer::~ScopedFrameBlamer() { | 936 ScopedFrameBlamer::~ScopedFrameBlamer() { |
934 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 937 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
935 m_frame->client()->frameBlameContext()->Leave(); | 938 m_frame->client()->frameBlameContext()->Leave(); |
936 } | 939 } |
937 | 940 |
938 } // namespace blink | 941 } // namespace blink |
OLD | NEW |