Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 2752203002: FasterLocationReload: remove the field trial flag (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 DCHECK(isReloadLoadType(loadType)); 382 DCHECK(isReloadLoadType(loadType));
383 if (clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect) { 383 if (clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect) {
384 if (!m_loader.currentItem()) 384 if (!m_loader.currentItem())
385 return; 385 return;
386 FrameLoadRequest request = 386 FrameLoadRequest request =
387 FrameLoadRequest(nullptr, m_loader.resourceRequestForReload( 387 FrameLoadRequest(nullptr, m_loader.resourceRequestForReload(
388 loadType, KURL(), clientRedirectPolicy)); 388 loadType, KURL(), clientRedirectPolicy));
389 request.setClientRedirect(clientRedirectPolicy); 389 request.setClientRedirect(clientRedirectPolicy);
390 m_loader.load(request, loadType); 390 m_loader.load(request, loadType);
391 } else { 391 } else {
392 if (RuntimeEnabledFeatures::fasterLocationReloadEnabled()) 392 DCHECK_EQ(FrameLoadTypeReloadMainResource, loadType);
393 DCHECK_EQ(FrameLoadTypeReloadMainResource, loadType);
394 else
395 DCHECK_EQ(FrameLoadTypeReload, loadType);
396 m_navigationScheduler->scheduleReload(); 393 m_navigationScheduler->scheduleReload();
397 } 394 }
398 } 395 }
399 396
400 void LocalFrame::detach(FrameDetachType type) { 397 void LocalFrame::detach(FrameDetachType type) {
401 // Note that detach() can be re-entered, so it's not possible to 398 // Note that detach() can be re-entered, so it's not possible to
402 // DCHECK(!m_isDetaching) here. 399 // DCHECK(!m_isDetaching) here.
403 m_isDetaching = true; 400 m_isDetaching = true;
404 401
405 if (isLocalRoot()) 402 if (isLocalRoot())
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
918 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) 915 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
919 m_frame->client()->frameBlameContext()->Enter(); 916 m_frame->client()->frameBlameContext()->Enter();
920 } 917 }
921 918
922 ScopedFrameBlamer::~ScopedFrameBlamer() { 919 ScopedFrameBlamer::~ScopedFrameBlamer() {
923 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) 920 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
924 m_frame->client()->frameBlameContext()->Leave(); 921 m_frame->client()->frameBlameContext()->Leave();
925 } 922 }
926 923
927 } // namespace blink 924 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/History.cpp ('k') | third_party/WebKit/Source/core/frame/Location.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698