Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp - Issue 10391049: Merge 116319 - Unreviewed, rolling out r115525.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp

Issue 10391049: Merge 116319 - Unreviewed, rolling out r115525. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/

Patch Set: Created 8 years, 7 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

« no previous file with comments | « Source/WebCore/platform/graphics/DisplayRefreshMonitor.h ('k') | Source/WebCore/platform/graphics/blackberry/DisplayRefreshMonitorBlackBerry.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp

===================================================================

--- Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp (revision 116642)

+++ Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp (working copy)

@@ -53,7 +53,7 @@

}

DisplayRefreshMonitor::DisplayRefreshMonitor(PlatformDisplayID displayID)

- : m_monotonicAnimationStartTime(0)

+ : m_timestamp(0)

, m_active(true)

, m_scheduled(false)

, m_previousFrameDone(true)

@@ -75,15 +75,15 @@

void DisplayRefreshMonitor::notifyClients()

{

- double monotonicAnimationStartTime;

+ double timestamp;

{

MutexLocker lock(m_mutex);

m_scheduled = false;

- monotonicAnimationStartTime = m_monotonicAnimationStartTime;

+ timestamp = m_timestamp;

}

for (size_t i = 0; i < m_clients.size(); ++i)

- m_clients[i]->fireDisplayRefreshIfNeeded(monotonicAnimationStartTime);

+ m_clients[i]->fireDisplayRefreshIfNeeded(timestamp);

{

MutexLocker lock(m_mutex);