Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3400)

Unified Diff: Source/core/timing/Performance.cpp

Issue 879423003: Move Location to DOMWindow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/timing/Performance.cpp
diff --git a/Source/core/timing/Performance.cpp b/Source/core/timing/Performance.cpp
index a8000fa8f17492f286b29f2f605e5a222c5f5e0e..06c4c30bb4e8b7234150f820fde95d0fc2adce47 100644
--- a/Source/core/timing/Performance.cpp
+++ b/Source/core/timing/Performance.cpp
@@ -49,7 +49,7 @@ static const size_t defaultResourceTimingBufferSize = 150;
Performance::Performance(LocalFrame* frame)
: DOMWindowProperty(frame)
, m_resourceTimingBufferSize(defaultResourceTimingBufferSize)
- , m_referenceTime(frame && frame->host() ? frame->document()->loader()->timing()->referenceMonotonicTime() : 0.0)
+ , m_referenceTime(localFrame() && localFrame()->host() ? localFrame()->document()->loader()->timing()->referenceMonotonicTime() : 0.0)
, m_userTiming(nullptr)
{
}
@@ -65,9 +65,9 @@ const AtomicString& Performance::interfaceName() const
ExecutionContext* Performance::executionContext() const
{
- if (!frame())
+ if (!localFrame())
return nullptr;
- return frame()->document();
+ return localFrame()->document();
}
PassRefPtrWillBeRawPtr<MemoryInfo> Performance::memory() const
@@ -78,7 +78,7 @@ PassRefPtrWillBeRawPtr<MemoryInfo> Performance::memory() const
PerformanceNavigation* Performance::navigation() const
{
if (!m_navigation)
- m_navigation = PerformanceNavigation::create(m_frame);
+ m_navigation = PerformanceNavigation::create(localFrame());
return m_navigation.get();
}
@@ -86,7 +86,7 @@ PerformanceNavigation* Performance::navigation() const
PerformanceTiming* Performance::timing() const
{
if (!m_timing)
- m_timing = PerformanceTiming::create(m_frame);
+ m_timing = PerformanceTiming::create(localFrame());
return m_timing.get();
}

Powered by Google App Engine
This is Rietveld 408576698