diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-07-15 12:03:35 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-07-20 16:57:23 +0100 |
| commit | e458d70a0d18538346f41b503114c9ebe6b2ce12 (patch) | |
| tree | 86f1637deca2c524432a822e5fcedd4bef221091 /WebCore/page/Timing.cpp | |
| parent | f43eabc081f7ce6af24b9df4953498a3cd6ca24d (diff) | |
| download | external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.zip external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.tar.gz external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.tar.bz2 | |
Merge WebKit at r63173 : Initial merge by git.
Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
Diffstat (limited to 'WebCore/page/Timing.cpp')
| -rw-r--r-- | WebCore/page/Timing.cpp | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/WebCore/page/Timing.cpp b/WebCore/page/Timing.cpp index dcd0fb7..af00441 100644 --- a/WebCore/page/Timing.cpp +++ b/WebCore/page/Timing.cpp @@ -52,12 +52,36 @@ void Timing::disconnectFrame() m_frame = 0; } -unsigned long Timing::navigationStart() const +unsigned long long Timing::navigationStart() const { if (!m_frame) return 0; - return 0; // FIXME + return static_cast<unsigned long long>(m_frame->loader()->frameLoadTimeline()->navigationStart * 1000); +} + +unsigned long long Timing::unloadEventEnd() const +{ + if (!m_frame) + return 0; + + return static_cast<unsigned long long>(m_frame->loader()->frameLoadTimeline()->unloadEventEnd * 1000); +} + +unsigned long long Timing::loadEventStart() const +{ + if (!m_frame) + return 0; + + return static_cast<unsigned long long>(m_frame->loader()->frameLoadTimeline()->loadEventStart * 1000); +} + +unsigned long long Timing::loadEventEnd() const +{ + if (!m_frame) + return 0; + + return static_cast<unsigned long long>(m_frame->loader()->frameLoadTimeline()->loadEventEnd * 1000); } } // namespace WebCore |