diff options
| author | Iain Merrick <husky@google.com> | 2010-08-19 17:55:56 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-08-23 11:05:40 +0100 |
| commit | f486d19d62f1bc33246748b14b14a9dfa617b57f (patch) | |
| tree | 195485454c93125455a30e553a73981c3816144d /WebCore/loader/RedirectScheduler.h | |
| parent | 6ba0b43722d16bc295606bec39f396f596e4fef1 (diff) | |
| download | external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.zip external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.gz external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.bz2 | |
Merge WebKit at r65615 : Initial merge by git.
Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
Diffstat (limited to 'WebCore/loader/RedirectScheduler.h')
| -rw-r--r-- | WebCore/loader/RedirectScheduler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/loader/RedirectScheduler.h b/WebCore/loader/RedirectScheduler.h index 0203e08..70b0202 100644 --- a/WebCore/loader/RedirectScheduler.h +++ b/WebCore/loader/RedirectScheduler.h @@ -70,7 +70,7 @@ private: void timerFired(Timer<RedirectScheduler>*); void schedule(PassOwnPtr<ScheduledNavigation>); - static bool mustLockBackForwardList(Frame* targetFrame); + static bool mustLockBackForwardList(Frame* targetFrame, bool mustLockIfDuringLoad); Frame* m_frame; Timer<RedirectScheduler> m_timer; @@ -79,4 +79,4 @@ private: } // namespace WebCore -#endif // FrameLoader_h +#endif // RedirectScheduler_h |