| 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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 } | 138 } |
| 139 | 139 |
| 140 bool shouldStartTimer(LocalFrame* frame) override { return frame->document()
->loadEventFinished(); } | 140 bool shouldStartTimer(LocalFrame* frame) override { return frame->document()
->loadEventFinished(); } |
| 141 | 141 |
| 142 void fire(LocalFrame* frame) override | 142 void fire(LocalFrame* frame) override |
| 143 { | 143 { |
| 144 OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicat
or(); | 144 OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicat
or(); |
| 145 FrameLoadRequest request(originDocument(), url(), "_self"); | 145 FrameLoadRequest request(originDocument(), url(), "_self"); |
| 146 request.setReplacesCurrentItem(replacesCurrentItem()); | 146 request.setReplacesCurrentItem(replacesCurrentItem()); |
| 147 if (equalIgnoringFragmentIdentifier(frame->document()->url(), request.re
sourceRequest().url())) | 147 if (equalIgnoringFragmentIdentifier(frame->document()->url(), request.re
sourceRequest().url())) |
| 148 request.resourceRequest().setCachePolicy(ReloadIgnoringCacheData); | 148 request.resourceRequest().setCachePolicy(ValidatingCacheData); |
| 149 request.setClientRedirect(ClientRedirect); | 149 request.setClientRedirect(ClientRedirect); |
| 150 frame->loader().load(request); | 150 frame->loader().load(request); |
| 151 } | 151 } |
| 152 | 152 |
| 153 private: | 153 private: |
| 154 ScheduledRedirect(double delay, Document* originDocument, const String& url,
bool replacesCurrentItem) | 154 ScheduledRedirect(double delay, Document* originDocument, const String& url,
bool replacesCurrentItem) |
| 155 : ScheduledURLNavigation(delay, originDocument, url, replacesCurrentItem
, false) | 155 : ScheduledURLNavigation(delay, originDocument, url, replacesCurrentItem
, false) |
| 156 { | 156 { |
| 157 clearUserGesture(); | 157 clearUserGesture(); |
| 158 } | 158 } |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 432 m_redirect.clear(); | 432 m_redirect.clear(); |
| 433 } | 433 } |
| 434 | 434 |
| 435 DEFINE_TRACE(NavigationScheduler) | 435 DEFINE_TRACE(NavigationScheduler) |
| 436 { | 436 { |
| 437 visitor->trace(m_frame); | 437 visitor->trace(m_frame); |
| 438 visitor->trace(m_redirect); | 438 visitor->trace(m_redirect); |
| 439 } | 439 } |
| 440 | 440 |
| 441 } // namespace blink | 441 } // namespace blink |
| OLD | NEW |