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. (http://www.t orchmobile.com/) | 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) |
| 5 * Copyright (C) 2009 Adam Barth. All rights reserved. | 5 * Copyright (C) 2009 Adam Barth. All rights reserved. |
| 6 * | 6 * |
| 7 * Redistribution and use in source and binary forms, with or without | 7 * Redistribution and use in source and binary forms, with or without |
| 8 * modification, are permitted provided that the following conditions | 8 * modification, are permitted provided that the following conditions |
| 9 * are met: | 9 * are met: |
| 10 * | 10 * |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 146 if (equalIgnoringFragmentIdentifier(frame->document()->url(), request.re sourceRequest().url())) | 146 if (equalIgnoringFragmentIdentifier(frame->document()->url(), request.re sourceRequest().url())) |
| 147 request.resourceRequest().setCachePolicy(ReloadIgnoringCacheData); | 147 request.resourceRequest().setCachePolicy(ReloadIgnoringCacheData); |
| 148 request.setClientRedirect(ClientRedirect); | 148 request.setClientRedirect(ClientRedirect); |
| 149 frame->loader().load(request); | 149 frame->loader().load(request); |
| 150 } | 150 } |
| 151 }; | 151 }; |
| 152 | 152 |
| 153 class ScheduledLocationChange FINAL : public ScheduledURLNavigation { | 153 class ScheduledLocationChange FINAL : public ScheduledURLNavigation { |
| 154 public: | 154 public: |
| 155 ScheduledLocationChange(Document* originDocument, const String& url, const R eferrer& referrer, bool lockBackForwardList) | 155 ScheduledLocationChange(Document* originDocument, const String& url, const R eferrer& referrer, bool lockBackForwardList) |
| 156 : ScheduledURLNavigation(0.0, originDocument, url, referrer, lockBackFor wardList, true) { } | 156 : ScheduledURLNavigation(0.0, originDocument, url, referrer, lockBackFor wardList, !protocolIsJavaScript(url)) { } |
|
Nate Chapin
2014/09/15 23:39:35
A pending navigation to a JS url shouldn't stop ht
| |
| 157 }; | 157 }; |
| 158 | 158 |
| 159 class ScheduledReload FINAL : public ScheduledNavigation { | 159 class ScheduledReload FINAL : public ScheduledNavigation { |
| 160 public: | 160 public: |
| 161 ScheduledReload() | 161 ScheduledReload() |
| 162 : ScheduledNavigation(0.0, true, true) | 162 : ScheduledNavigation(0.0, true, true) |
| 163 { | 163 { |
| 164 } | 164 } |
| 165 | 165 |
| 166 virtual void fire(LocalFrame* frame) OVERRIDE | 166 virtual void fire(LocalFrame* frame) OVERRIDE |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 416 | 416 |
| 417 void NavigationScheduler::cancel() | 417 void NavigationScheduler::cancel() |
| 418 { | 418 { |
| 419 if (m_timer.isActive()) | 419 if (m_timer.isActive()) |
| 420 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); | 420 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); |
| 421 m_timer.stop(); | 421 m_timer.stop(); |
| 422 m_redirect.clear(); | 422 m_redirect.clear(); |
| 423 } | 423 } |
| 424 | 424 |
| 425 } // namespace blink | 425 } // namespace blink |
| OLD | NEW |