diff options
author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/page/Timing.cpp | |
parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/page/Timing.cpp')
-rw-r--r-- | WebCore/page/Timing.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/WebCore/page/Timing.cpp b/WebCore/page/Timing.cpp index f65322b..8a0de2a 100644 --- a/WebCore/page/Timing.cpp +++ b/WebCore/page/Timing.cpp @@ -100,7 +100,7 @@ unsigned long long Timing::unloadEventEnd() const return toIntegerMilliseconds(timing->unloadEventEnd); } - + unsigned long long Timing::redirectStart() const { DocumentLoadTiming* timing = documentLoadTiming(); @@ -109,7 +109,7 @@ unsigned long long Timing::redirectStart() const return toIntegerMilliseconds(timing->redirectStart); } - + unsigned long long Timing::redirectEnd() const { DocumentLoadTiming* timing = documentLoadTiming(); @@ -218,12 +218,7 @@ unsigned long long Timing::requestStart() const unsigned long long Timing::requestEnd() const { - ResourceLoadTiming* timing = resourceLoadTiming(); - if (!timing) - return 0; - - ASSERT(timing->sendEnd >= 0); - return resourceLoadTimeRelativeToAbsolute(timing->sendEnd); + return responseStart(); } unsigned long long Timing::responseStart() const |