diff options
| author | Russell Brenner <russellbrenner@google.com> | 2010-11-18 17:33:13 -0800 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:21 -0800 |
| commit | 6b70adc33054f8aee8c54d0f460458a9df11b8a5 (patch) | |
| tree | 103a13998c33944d6ab3b8318c509a037e639460 /WebCore/page/Performance.cpp | |
| parent | bdf4ebc8e70b2d221b6ee7a65660918ecb1d33aa (diff) | |
| download | external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.zip external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.gz external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.bz2 | |
Merge WebKit at r72274: Initial merge by git.
Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
Diffstat (limited to 'WebCore/page/Performance.cpp')
| -rw-r--r-- | WebCore/page/Performance.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/WebCore/page/Performance.cpp b/WebCore/page/Performance.cpp index c4234a7..4e130ea 100644 --- a/WebCore/page/Performance.cpp +++ b/WebCore/page/Performance.cpp @@ -32,8 +32,8 @@ #include "Performance.h" #include "MemoryInfo.h" -#include "Navigation.h" -#include "Timing.h" +#include "PerformanceNavigation.h" +#include "PerformanceTiming.h" #if ENABLE(WEB_TIMING) @@ -72,18 +72,18 @@ MemoryInfo* Performance::memory() const return m_memory.get(); } -Navigation* Performance::navigation() const +PerformanceNavigation* Performance::navigation() const { if (!m_navigation) - m_navigation = Navigation::create(m_frame); + m_navigation = PerformanceNavigation::create(m_frame); return m_navigation.get(); } -Timing* Performance::timing() const +PerformanceTiming* Performance::timing() const { if (!m_timing) - m_timing = Timing::create(m_frame); + m_timing = PerformanceTiming::create(m_frame); return m_timing.get(); } |