| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2012 Intel Inc. All rights reserved. | 3 * Copyright (C) 2012 Intel Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 | 207 |
| 208 if (info.redirectChain().isEmpty()) { | 208 if (info.redirectChain().isEmpty()) { |
| 209 RefPtrWillBeRawPtr<PerformanceEntry> entry = PerformanceResourceTiming::
create(info, initiatorDocument, startTime, allowTimingDetails); | 209 RefPtrWillBeRawPtr<PerformanceEntry> entry = PerformanceResourceTiming::
create(info, initiatorDocument, startTime, allowTimingDetails); |
| 210 addResourceTimingBuffer(entry); | 210 addResourceTimingBuffer(entry); |
| 211 return; | 211 return; |
| 212 } | 212 } |
| 213 | 213 |
| 214 const Vector<ResourceResponse>& redirectChain = info.redirectChain(); | 214 const Vector<ResourceResponse>& redirectChain = info.redirectChain(); |
| 215 bool allowRedirectDetails = allowsTimingRedirect(redirectChain, finalRespons
e, initiatorDocument); | 215 bool allowRedirectDetails = allowsTimingRedirect(redirectChain, finalRespons
e, initiatorDocument); |
| 216 | 216 |
| 217 // ServiceWorker doesn't support TimingInfo. | 217 if (!allowRedirectDetails) { |
| 218 // FIXME: Implement ServiceWorkerURLRequestJob::GetLoadTimingInfo(). | |
| 219 if (!allowRedirectDetails && !finalResponse.wasFetchedViaServiceWorker()) { | |
| 220 ResourceLoadTiming* finalTiming = finalResponse.resourceLoadTiming(); | 218 ResourceLoadTiming* finalTiming = finalResponse.resourceLoadTiming(); |
| 221 ASSERT(finalTiming); | 219 ASSERT(finalTiming); |
| 222 if (finalTiming) | 220 if (finalTiming) |
| 223 startTime = finalTiming->requestTime; | 221 startTime = finalTiming->requestTime; |
| 224 } | 222 } |
| 225 | 223 |
| 226 ResourceLoadTiming* lastRedirectTiming = redirectChain.last().resourceLoadTi
ming(); | 224 ResourceLoadTiming* lastRedirectTiming = redirectChain.last().resourceLoadTi
ming(); |
| 227 ASSERT(lastRedirectTiming); | 225 ASSERT(lastRedirectTiming); |
| 228 double lastRedirectEndTime = lastRedirectTiming->receiveHeadersEnd; | 226 double lastRedirectEndTime = lastRedirectTiming->receiveHeadersEnd; |
| 229 | 227 |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 void Performance::trace(Visitor* visitor) | 278 void Performance::trace(Visitor* visitor) |
| 281 { | 279 { |
| 282 visitor->trace(m_navigation); | 280 visitor->trace(m_navigation); |
| 283 visitor->trace(m_timing); | 281 visitor->trace(m_timing); |
| 284 visitor->trace(m_resourceTimingBuffer); | 282 visitor->trace(m_resourceTimingBuffer); |
| 285 visitor->trace(m_userTiming); | 283 visitor->trace(m_userTiming); |
| 286 EventTargetWithInlineData::trace(visitor); | 284 EventTargetWithInlineData::trace(visitor); |
| 287 } | 285 } |
| 288 | 286 |
| 289 } // namespace blink | 287 } // namespace blink |
| OLD | NEW |