Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 257 }; | 257 }; |
| 258 | 258 |
| 259 class ScheduledReload final : public ScheduledNavigation { | 259 class ScheduledReload final : public ScheduledNavigation { |
| 260 public: | 260 public: |
| 261 static ScheduledReload* create() { return new ScheduledReload; } | 261 static ScheduledReload* create() { return new ScheduledReload; } |
| 262 | 262 |
| 263 void fire(LocalFrame* frame) override { | 263 void fire(LocalFrame* frame) override { |
| 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 FrameLoadTypeReloadMainResource, KURL(), |
|
Takashi Toyoshima
2017/03/23 08:45:43
non-mechanical. I think reviewers can review this
| |
| 268 ClientRedirectPolicy::ClientRedirect); | |
| 268 if (resourceRequest.isNull()) | 269 if (resourceRequest.isNull()) |
| 269 return; | 270 return; |
| 270 FrameLoadRequest request = FrameLoadRequest(nullptr, resourceRequest); | 271 FrameLoadRequest request = FrameLoadRequest(nullptr, resourceRequest); |
| 271 request.setClientRedirect(ClientRedirectPolicy::ClientRedirect); | 272 request.setClientRedirect(ClientRedirectPolicy::ClientRedirect); |
| 272 maybeLogScheduledNavigationClobber(ScheduledNavigationType::ScheduledReload, | 273 maybeLogScheduledNavigationClobber(ScheduledNavigationType::ScheduledReload, |
| 273 frame); | 274 frame); |
| 274 frame->loader().load(request, FrameLoadTypeReloadMainResource); | 275 frame->loader().load(request, FrameLoadTypeReloadMainResource); |
| 275 } | 276 } |
| 276 | 277 |
| 277 private: | 278 private: |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 538 m_navigateTaskHandle.cancel(); | 539 m_navigateTaskHandle.cancel(); |
| 539 m_redirect.clear(); | 540 m_redirect.clear(); |
| 540 } | 541 } |
| 541 | 542 |
| 542 DEFINE_TRACE(NavigationScheduler) { | 543 DEFINE_TRACE(NavigationScheduler) { |
| 543 visitor->trace(m_frame); | 544 visitor->trace(m_frame); |
| 544 visitor->trace(m_redirect); | 545 visitor->trace(m_redirect); |
| 545 } | 546 } |
| 546 | 547 |
| 547 } // namespace blink | 548 } // namespace blink |
| OLD | NEW |