FasterLocationReload: use ReloadMainResource for JS exposed reloads

third_party/WebKit/Source/core/loader/NavigationScheduler.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2009 Adam Barth. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 240 matching lines @@
                           bool replacesCurrentItem)
       : ScheduledURLNavigation(0.0,
                                originDocument,
                                url,
                                replacesCurrentItem,
                                !protocolIsJavaScript(url)) {}
 };
 
 class ScheduledReload final : public ScheduledNavigation {
  public:
-  static ScheduledReload* create() { return new ScheduledReload; }
+  static ScheduledReload* create(FrameLoadType type) {
+    DCHECK(isReloadLoadType(type));
+    return new ScheduledReload(type);
+  }
 
   void fire(LocalFrame* frame) override {
     std::unique_ptr<UserGestureIndicator> gestureIndicator =
         createUserGestureIndicator();
     ResourceRequest resourceRequest = frame->loader().resourceRequestForReload(
         FrameLoadTypeReload, KURL(), ClientRedirectPolicy::ClientRedirect);
     if (resourceRequest.isNull())
       return;
     FrameLoadRequest request = FrameLoadRequest(nullptr, resourceRequest);
     request.setClientRedirect(ClientRedirectPolicy::ClientRedirect);
     maybeLogScheduledNavigationClobber(ScheduledNavigationType::ScheduledReload,
                                        frame);
-    frame->loader().load(request, FrameLoadTypeReload);
+    frame->loader().load(request, m_type);

[kouhei (in TOK), 2016/12/14 10:57:41]

Instead of referring to m_type here, can this also check 
RuntimeEnabledFeatures::fasterLocationReloadEnabled()?

[Takashi Toyoshima, 2016/12/14 12:31:10]

Done.

   }
 
  private:
-  ScheduledReload() : ScheduledNavigation(0.0, nullptr, true, true) {}
+  ScheduledReload(FrameLoadType type)
+      : ScheduledNavigation(0.0, nullptr, true, true), m_type(type) {}
+
+  FrameLoadType m_type;
 };
 
 class ScheduledPageBlock final : public ScheduledNavigation {
  public:
   static ScheduledPageBlock* create(Document* originDocument, int reason) {
     return new ScheduledPageBlock(originDocument, reason);
   }
 
   void fire(LocalFrame* frame) override {
     frame->loader().client()->loadErrorPage(m_reason);
@@ skipping 168 matching lines @@
   schedule(ScheduledPageBlock::create(originDocument, reason));
 }
 
 void NavigationScheduler::scheduleFormSubmission(Document* document,
                                                  FormSubmission* submission) {
   DCHECK(m_frame->page());
   schedule(ScheduledFormSubmission::create(document, submission,
                                            mustReplaceCurrentItem(m_frame)));
 }
 
-void NavigationScheduler::scheduleReload() {
+void NavigationScheduler::scheduleReload(FrameLoadType type) {
   if (!shouldScheduleReload())
     return;
   if (m_frame->document()->url().isEmpty())
     return;
-  schedule(ScheduledReload::create());
+  schedule(ScheduledReload::create(type));
 }
 
 void NavigationScheduler::navigateTask() {
   Platform::current()->currentThread()->scheduler()->removePendingNavigation(
       m_frameType);
 
   if (!m_frame->page())
     return;
   if (m_frame->page()->suspended()) {
     InspectorInstrumentation::frameClearedScheduledNavigation(m_frame);
@@ skipping 60 matching lines @@
   m_navigateTaskHandle.cancel();
   m_redirect.clear();
 }
 
 DEFINE_TRACE(NavigationScheduler) {
   visitor->trace(m_frame);
   visitor->trace(m_redirect);
 }
 
 }  // namespace blink