Merge 116319 - Unreviewed, rolling out r115525.

Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp

 /*
  * Copyright (C) 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 35 matching lines @@
 
 void DisplayRefreshMonitorClient::fireDisplayRefreshIfNeeded(double timestamp)
 {
     if (m_scheduled) {
         m_scheduled = false;
         displayRefreshFired(timestamp);
     }
 }
 
 DisplayRefreshMonitor::DisplayRefreshMonitor(PlatformDisplayID displayID)
-    : m_monotonicAnimationStartTime(0)
+    : m_timestamp(0)
     , m_active(true)
     , m_scheduled(false)
     , m_previousFrameDone(true)
     , m_displayID(displayID)
 #if PLATFORM(MAC)
     , m_displayLink(0)
 #endif
 #if PLATFORM(BLACKBERRY)
     , m_animationClient(0)
 #endif
 {
 }
 
 void DisplayRefreshMonitor::refreshDisplayOnMainThread(void* data)
 {
     DisplayRefreshMonitor* monitor = static_cast<DisplayRefreshMonitor*>(data);
     monitor->notifyClients();
 }
 
 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);
         m_previousFrameDone = true;
     }
 }
 
 DisplayRefreshMonitorManager* DisplayRefreshMonitorManager::sharedManager()
 {
     DEFINE_STATIC_LOCAL(DisplayRefreshMonitorManager, manager, ());
@@ skipping 64 matching lines @@
     unregisterClient(client);
     client->setDisplayID(displayID);
     registerClient(client);
     if (client->m_scheduled)
         scheduleAnimation(client);
 }
 
 }
 
 #endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)