summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/page
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-06-13 21:32:43 +0100
committerSteve Block <steveblock@google.com>2011-06-14 03:16:53 +0100
commitdf107b9482a6c8016393ca90bae1e6ecc49e943b (patch)
treed71c307095eb4fb8f79472016f569ee85f2e2066 /Source/WebCore/page
parentb3b0a11cfa8f7ee842f7b8c57a12326036312eb8 (diff)
downloadexternal_webkit-df107b9482a6c8016393ca90bae1e6ecc49e943b.zip
external_webkit-df107b9482a6c8016393ca90bae1e6ecc49e943b.tar.gz
external_webkit-df107b9482a6c8016393ca90bae1e6ecc49e943b.tar.bz2
Cherry-pick WebKit change 85873 to fix a performance timing bug
See http://trac.webkit.org/changeset/85873 Bug: 4442995 Change-Id: I27c5d678a534ec0b64d59868f6f77e51c477e89d
Diffstat (limited to 'Source/WebCore/page')
-rw-r--r--Source/WebCore/page/PerformanceTiming.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/WebCore/page/PerformanceTiming.cpp b/Source/WebCore/page/PerformanceTiming.cpp
index f17e771..29bf184 100644
--- a/Source/WebCore/page/PerformanceTiming.cpp
+++ b/Source/WebCore/page/PerformanceTiming.cpp
@@ -94,9 +94,6 @@ unsigned long long PerformanceTiming::navigationStart() const
if (!timing)
return 0;
- if (timing->hasCrossOriginRedirect)
- return 0;
-
return toIntegerMilliseconds(timing->navigationStart);
}