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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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, FrameLoadTypeReload); | 274 if (RuntimeEnabledFeatures::fasterLocationReloadEnabled()) |
| 275 frame->loader().load(request, FrameLoadTypeReloadMainResource); |
| 276 else |
| 277 frame->loader().load(request, FrameLoadTypeReload); |
275 } | 278 } |
276 | 279 |
277 private: | 280 private: |
278 ScheduledReload() : ScheduledNavigation(0.0, nullptr, true, true) {} | 281 ScheduledReload() : ScheduledNavigation(0.0, nullptr, true, true) {} |
279 }; | 282 }; |
280 | 283 |
281 class ScheduledPageBlock final : public ScheduledNavigation { | 284 class ScheduledPageBlock final : public ScheduledNavigation { |
282 public: | 285 public: |
283 static ScheduledPageBlock* create(Document* originDocument, int reason) { | 286 static ScheduledPageBlock* create(Document* originDocument, int reason) { |
284 return new ScheduledPageBlock(originDocument, reason); | 287 return new ScheduledPageBlock(originDocument, reason); |
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
543 m_navigateTaskHandle.cancel(); | 546 m_navigateTaskHandle.cancel(); |
544 m_redirect.clear(); | 547 m_redirect.clear(); |
545 } | 548 } |
546 | 549 |
547 DEFINE_TRACE(NavigationScheduler) { | 550 DEFINE_TRACE(NavigationScheduler) { |
548 visitor->trace(m_frame); | 551 visitor->trace(m_frame); |
549 visitor->trace(m_redirect); | 552 visitor->trace(m_redirect); |
550 } | 553 } |
551 | 554 |
552 } // namespace blink | 555 } // namespace blink |
OLD | NEW |