Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.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/mac/DisplayRefreshMonitorMac.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/blackberry/DisplayRefreshMonitorBlackBerry.cpp ('k') | Source/WebKit/chromium/src/PageWidgetDelegate.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.cpp

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

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

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

@@ -45,7 +45,7 @@

return kCVReturnSuccess;

}

DisplayRefreshMonitor::~DisplayRefreshMonitor()

{

if (m_displayLink) {

@@ -61,7 +61,7 @@

{

if (!m_active)

return false;

if (!m_displayLink) {

m_active = false;

CVReturn error = CVDisplayLinkCreateWithCGDisplay(m_displayID, &m_displayLink);

@@ -78,7 +78,7 @@

m_active = true;

}

MutexLocker lock(m_mutex);

m_scheduled = true;

return true;

@@ -92,11 +92,9 @@

m_previousFrameDone = false;

- double webKitMonotonicNow = monotonicallyIncreasingTime();

- double timeUntilOutput = outputTimeSeconds - nowSeconds;

- // FIXME: Should this be using webKitMonotonicNow?

- m_monotonicAnimationStartTime = webKitMonotonicNow + timeUntilOutput;

+ double webKitNow = currentTime();

+ m_timestamp = webKitNow - nowSeconds + outputTimeSeconds;

callOnMainThread(refreshDisplayOnMainThread, this);

}