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

Side by Side Diff: third_party/WebKit/Source/core/loader/NavigationScheduler.cpp

Issue 2772753002: Change FrameLoadTypeReload to take FrameLoadTypeReloadMainResource's behavior (Closed)
Patch Set: rebase error fix (replace newly added ReloadMainResource) 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) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
5 * (http://www.torchmobile.com/) 5 * (http://www.torchmobile.com/)
6 * Copyright (C) 2009 Adam Barth. All rights reserved. 6 * Copyright (C) 2009 Adam Barth. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 std::unique_ptr<UserGestureIndicator> gestureIndicator = 264 std::unique_ptr<UserGestureIndicator> gestureIndicator =
265 createUserGestureIndicator(); 265 createUserGestureIndicator();
266 ResourceRequest resourceRequest = frame->loader().resourceRequestForReload( 266 ResourceRequest resourceRequest = frame->loader().resourceRequestForReload(
267 FrameLoadTypeReload, KURL(), ClientRedirectPolicy::ClientRedirect); 267 FrameLoadTypeReload, KURL(), ClientRedirectPolicy::ClientRedirect);
268 if (resourceRequest.isNull()) 268 if (resourceRequest.isNull())
269 return; 269 return;
270 FrameLoadRequest request = FrameLoadRequest(nullptr, resourceRequest); 270 FrameLoadRequest request = FrameLoadRequest(nullptr, resourceRequest);
271 request.setClientRedirect(ClientRedirectPolicy::ClientRedirect); 271 request.setClientRedirect(ClientRedirectPolicy::ClientRedirect);
272 maybeLogScheduledNavigationClobber(ScheduledNavigationType::ScheduledReload, 272 maybeLogScheduledNavigationClobber(ScheduledNavigationType::ScheduledReload,
273 frame); 273 frame);
274 frame->loader().load(request, FrameLoadTypeReloadMainResource); 274 frame->loader().load(request, FrameLoadTypeReload);
275 } 275 }
276 276
277 private: 277 private:
278 ScheduledReload() : ScheduledNavigation(0.0, nullptr, true, true) {} 278 ScheduledReload() : ScheduledNavigation(0.0, nullptr, true, true) {}
279 }; 279 };
280 280
281 class ScheduledPageBlock final : public ScheduledNavigation { 281 class ScheduledPageBlock final : public ScheduledNavigation {
282 public: 282 public:
283 static ScheduledPageBlock* create(Document* originDocument, int reason) { 283 static ScheduledPageBlock* create(Document* originDocument, int reason) {
284 return new ScheduledPageBlock(originDocument, reason); 284 return new ScheduledPageBlock(originDocument, reason);
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 m_navigateTaskHandle.cancel(); 538 m_navigateTaskHandle.cancel();
539 m_redirect.clear(); 539 m_redirect.clear();
540 } 540 }
541 541
542 DEFINE_TRACE(NavigationScheduler) { 542 DEFINE_TRACE(NavigationScheduler) {
543 visitor->trace(m_frame); 543 visitor->trace(m_frame);
544 visitor->trace(m_redirect); 544 visitor->trace(m_redirect);
545 } 545 }
546 546
547 } // namespace blink 547 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameLoaderTypes.h ('k') | third_party/WebKit/Source/core/testing/Internals.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698