FrameLoader: add and export isReloadLoadType()

third_party/WebKit/Source/core/frame/LocalFrame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 338 matching lines @@
     m_navigationScheduler->scheduleLocationChange(&originDocument, url.getString(), replaceCurrentItem);
 }
 
 void LocalFrame::navigate(const FrameLoadRequest& request)
 {
     m_loader.load(request);
 }
 
 void LocalFrame::reload(FrameLoadType loadType, ClientRedirectPolicy clientRedirectPolicy)
 {
-    ASSERT(loadType == FrameLoadTypeReload || loadType == FrameLoadTypeReloadBypassingCache);
-    ASSERT(clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect || loadType == FrameLoadTypeReload);
+    DCHECK(isReloadLoadType(loadType));

[Takashi Toyoshima, 2016/07/27 10:26:48]

This isn't mechanical change, but this should allow
FrameLoadTypeReloadMainResource.

     if (clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect) {
         if (!m_loader.currentItem())
             return;
         FrameLoadRequest request = FrameLoadRequest(
             nullptr, m_loader.resourceRequestForReload(loadType, KURL(), clientRedirectPolicy));
         request.setClientRedirect(clientRedirectPolicy);
         m_loader.load(request, loadType);
     } else {
+        DCHECK(loadType == FrameLoadTypeReload);

[Takashi Toyoshima, 2016/07/27 10:26:48]

For me, this DCHECK is easier to understand the intention than the original
ASSERT that I was confused a little at the first glance. What do you think?

Note: ClientRedirectPolicy is binary of NotClientRedirect or ClientRedirect.

         m_navigationScheduler->scheduleReload();
     }
 }
 
 void LocalFrame::detach(FrameDetachType type)
 {
     PluginScriptForbiddenScope forbidPluginDestructorScripting;
     m_loader.stopAllLoaders();
     // Don't allow any new child frames to load in this frame: attaching a new
     // child frame during or after detaching children results in an attached
@@ skipping 491 matching lines @@
         m_frame->client()->frameBlameContext()->Enter();
 }
 
 ScopedFrameBlamer::~ScopedFrameBlamer()
 {
     if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
         m_frame->client()->frameBlameContext()->Leave();
 }
 
 } // namespace blink