diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebCore/loader/RedirectScheduler.h | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebCore/loader/RedirectScheduler.h')
| -rw-r--r-- | WebCore/loader/RedirectScheduler.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/loader/RedirectScheduler.h b/WebCore/loader/RedirectScheduler.h index 005a173..ac3731c 100644 --- a/WebCore/loader/RedirectScheduler.h +++ b/WebCore/loader/RedirectScheduler.h @@ -44,7 +44,7 @@ class Frame; class String; struct FrameLoadRequest; -struct ScheduledRedirection; +class ScheduledNavigation; class RedirectScheduler : public Noncopyable { public: @@ -67,13 +67,13 @@ public: private: void timerFired(Timer<RedirectScheduler>*); - void schedule(PassOwnPtr<ScheduledRedirection>); + void schedule(PassOwnPtr<ScheduledNavigation>); static bool mustLockBackForwardList(Frame* targetFrame); Frame* m_frame; Timer<RedirectScheduler> m_timer; - OwnPtr<ScheduledRedirection> m_scheduledRedirection; + OwnPtr<ScheduledNavigation> m_redirect; }; } // namespace WebCore |