summaryrefslogtreecommitdiffstats
path: root/WebCore/page/Navigation.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/page/Navigation.cpp')
-rw-r--r--WebCore/page/Navigation.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/WebCore/page/Navigation.cpp b/WebCore/page/Navigation.cpp
index efda924..ad93b47 100644
--- a/WebCore/page/Navigation.cpp
+++ b/WebCore/page/Navigation.cpp
@@ -57,20 +57,20 @@ void Navigation::disconnectFrame()
unsigned short Navigation::type() const
{
if (!m_frame)
- return Navigate;
+ return NAVIGATE;
DocumentLoader* documentLoader = m_frame->loader()->documentLoader();
if (!documentLoader)
- return Navigate;
+ return NAVIGATE;
WebCore::NavigationType navigationType = documentLoader->triggeringAction().type();
switch (navigationType) {
case NavigationTypeReload:
- return Reload;
+ return RELOAD;
case NavigationTypeBackForward:
- return BackForward;
+ return BACK_FORWARD;
default:
- return Navigate;
+ return NAVIGATE;
}
}
@@ -79,7 +79,11 @@ unsigned short Navigation::redirectCount() const
if (!m_frame)
return 0;
- return 0; // FIXME
+ DocumentLoader* loader = m_frame->loader()->documentLoader();
+ if (!loader)
+ return 0;
+
+ return loader->timing()->redirectCount;
}
} // namespace WebCore