| 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 17 matching lines...) Expand all  Loading... | 
|   28  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |   28  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
|   29  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |   29  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
|   30  */ |   30  */ | 
|   31  |   31  | 
|   32 #include "config.h" |   32 #include "config.h" | 
|   33 #include "core/timing/Performance.h" |   33 #include "core/timing/Performance.h" | 
|   34  |   34  | 
|   35 #include "core/dom/Document.h" |   35 #include "core/dom/Document.h" | 
|   36 #include "core/loader/DocumentLoader.h" |   36 #include "core/loader/DocumentLoader.h" | 
|   37 #include "core/timing/ResourceTimingInfo.h" |   37 #include "core/timing/ResourceTimingInfo.h" | 
|   38 #include "core/timing/MemoryInfo.h" |  | 
|   39 #include "core/timing/PerformanceEntry.h" |  | 
|   40 #include "core/timing/PerformanceNavigation.h" |  | 
|   41 #include "core/timing/PerformanceResourceTiming.h" |   38 #include "core/timing/PerformanceResourceTiming.h" | 
|   42 #include "core/timing/PerformanceTiming.h" |  | 
|   43 #include "core/timing/PerformanceUserTiming.h" |   39 #include "core/timing/PerformanceUserTiming.h" | 
|   44 #include "platform/weborigin/SecurityOrigin.h" |   40 #include "platform/weborigin/SecurityOrigin.h" | 
|   45 #include "wtf/CurrentTime.h" |   41 #include "wtf/CurrentTime.h" | 
|   46  |   42  | 
|   47 #include "core/frame/Frame.h" |   43 #include "core/frame/Frame.h" | 
|   48  |   44  | 
|   49 namespace WebCore { |   45 namespace WebCore { | 
|   50  |   46  | 
|   51 static const size_t defaultResourceTimingBufferSize = 150; |   47 static const size_t defaultResourceTimingBufferSize = 150; | 
|   52  |   48  | 
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  275         m_userTiming = UserTiming::create(this); |  271         m_userTiming = UserTiming::create(this); | 
|  276     m_userTiming->clearMeasures(measureName); |  272     m_userTiming->clearMeasures(measureName); | 
|  277 } |  273 } | 
|  278  |  274  | 
|  279 double Performance::now() const |  275 double Performance::now() const | 
|  280 { |  276 { | 
|  281     return 1000.0 * (monotonicallyIncreasingTime() - m_referenceTime); |  277     return 1000.0 * (monotonicallyIncreasingTime() - m_referenceTime); | 
|  282 } |  278 } | 
|  283  |  279  | 
|  284 } // namespace WebCore |  280 } // namespace WebCore | 
| OLD | NEW |