| 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 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 391 DCHECK(IsReloadLoadType(load_type)); | 391 DCHECK(IsReloadLoadType(load_type)); |
| 392 if (client_redirect_policy == ClientRedirectPolicy::kNotClientRedirect) { | 392 if (client_redirect_policy == ClientRedirectPolicy::kNotClientRedirect) { |
| 393 if (!loader_.GetDocumentLoader()->GetHistoryItem()) | 393 if (!loader_.GetDocumentLoader()->GetHistoryItem()) |
| 394 return; | 394 return; |
| 395 FrameLoadRequest request = FrameLoadRequest( | 395 FrameLoadRequest request = FrameLoadRequest( |
| 396 nullptr, loader_.ResourceRequestForReload(load_type, KURL(), | 396 nullptr, loader_.ResourceRequestForReload(load_type, KURL(), |
| 397 client_redirect_policy)); | 397 client_redirect_policy)); |
| 398 request.SetClientRedirect(client_redirect_policy); | 398 request.SetClientRedirect(client_redirect_policy); |
| 399 loader_.Load(request, load_type); | 399 loader_.Load(request, load_type); |
| 400 } else { | 400 } else { |
| 401 DCHECK_EQ(kFrameLoadTypeReload, load_type); | 401 DCHECK_EQ(RuntimeEnabledFeatures::locationHardReloadEnabled() |
| 402 ? kFrameLoadTypeReloadBypassingCache |
| 403 : kFrameLoadTypeReload, |
| 404 load_type); |
| 402 navigation_scheduler_->ScheduleReload(); | 405 navigation_scheduler_->ScheduleReload(); |
| 403 } | 406 } |
| 404 } | 407 } |
| 405 | 408 |
| 406 void LocalFrame::Detach(FrameDetachType type) { | 409 void LocalFrame::Detach(FrameDetachType type) { |
| 407 // Note that detach() can be re-entered, so it's not possible to | 410 // Note that detach() can be re-entered, so it's not possible to |
| 408 // DCHECK(isAttached()) here. | 411 // DCHECK(isAttached()) here. |
| 409 lifecycle_.AdvanceTo(FrameLifecycle::kDetaching); | 412 lifecycle_.AdvanceTo(FrameLifecycle::kDetaching); |
| 410 | 413 |
| 411 if (IsLocalRoot()) | 414 if (IsLocalRoot()) |
| (...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 946 if (frame_ && frame_->Client() && frame_->Client()->GetFrameBlameContext()) | 949 if (frame_ && frame_->Client() && frame_->Client()->GetFrameBlameContext()) |
| 947 frame_->Client()->GetFrameBlameContext()->Enter(); | 950 frame_->Client()->GetFrameBlameContext()->Enter(); |
| 948 } | 951 } |
| 949 | 952 |
| 950 ScopedFrameBlamer::~ScopedFrameBlamer() { | 953 ScopedFrameBlamer::~ScopedFrameBlamer() { |
| 951 if (frame_ && frame_->Client() && frame_->Client()->GetFrameBlameContext()) | 954 if (frame_ && frame_->Client() && frame_->Client()->GetFrameBlameContext()) |
| 952 frame_->Client()->GetFrameBlameContext()->Leave(); | 955 frame_->Client()->GetFrameBlameContext()->Leave(); |
| 953 } | 956 } |
| 954 | 957 |
| 955 } // namespace blink | 958 } // namespace blink |
| OLD | NEW |