Commit c2835aaa authored by Nate Chapin's avatar Nate Chapin Committed by Commit Bot

Don't route appcache foreign entry reloads through NavigationScheduler

Bug: 914587
Change-Id: Ic851c6ad1d8e78af40f6bb8df3d310ed5c472e14
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1570232Reviewed-by: default avatarDmitry Gozman <dgozman@chromium.org>
Commit-Queue: Nate Chapin <japhet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#651770}
parent ba412b51
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include "third_party/blink/public/platform/web_url_response.h" #include "third_party/blink/public/platform/web_url_response.h"
#include "third_party/blink/public/platform/web_vector.h" #include "third_party/blink/public/platform/web_vector.h"
#include "third_party/blink/renderer/core/events/application_cache_error_event.h" #include "third_party/blink/renderer/core/events/application_cache_error_event.h"
#include "third_party/blink/renderer/core/events/current_input_event.h"
#include "third_party/blink/renderer/core/events/progress_event.h" #include "third_party/blink/renderer/core/events/progress_event.h"
#include "third_party/blink/renderer/core/frame/deprecation.h" #include "third_party/blink/renderer/core/frame/deprecation.h"
#include "third_party/blink/renderer/core/frame/hosts_using_features.h" #include "third_party/blink/renderer/core/frame/hosts_using_features.h"
...@@ -50,6 +51,7 @@ ...@@ -50,6 +51,7 @@
#include "third_party/blink/renderer/core/inspector/inspector_application_cache_agent.h" #include "third_party/blink/renderer/core/inspector/inspector_application_cache_agent.h"
#include "third_party/blink/renderer/core/loader/appcache/application_cache.h" #include "third_party/blink/renderer/core/loader/appcache/application_cache.h"
#include "third_party/blink/renderer/core/loader/document_loader.h" #include "third_party/blink/renderer/core/loader/document_loader.h"
#include "third_party/blink/renderer/core/loader/frame_load_request.h"
#include "third_party/blink/renderer/core/loader/frame_loader.h" #include "third_party/blink/renderer/core/loader/frame_loader.h"
#include "third_party/blink/renderer/core/page/frame_tree.h" #include "third_party/blink/renderer/core/page/frame_tree.h"
#include "third_party/blink/renderer/core/page/page.h" #include "third_party/blink/renderer/core/page/page.h"
...@@ -158,9 +160,11 @@ void ApplicationCacheHost::SelectCacheWithManifest(const KURL& manifest_url) { ...@@ -158,9 +160,11 @@ void ApplicationCacheHost::SelectCacheWithManifest(const KURL& manifest_url) {
// navigation algorithm. The navigation will not result in the same resource // navigation algorithm. The navigation will not result in the same resource
// being loaded, because "foreign" entries are never picked during // being loaded, because "foreign" entries are never picked during
// navigation. see ApplicationCacheGroup::selectCache() // navigation. see ApplicationCacheGroup::selectCache()
frame->ScheduleNavigation(*document, document->Url(), FrameLoadRequest request(document, ResourceRequest(document->Url()));
WebFrameLoadType::kReplaceCurrentItem, request.SetClientRedirect(ClientRedirectPolicy::kClientRedirect);
UserGestureStatus::kNone); if (const WebInputEvent* input_event = CurrentInputEvent::Get())
request.SetInputStartTime(input_event->TimeStamp());
frame->Navigate(request, WebFrameLoadType::kReplaceCurrentItem);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment