Merge the Sky Engine changes from the SkyDart branch

sky/engine/core/frame/DOMTimer.cpp

 /*
  * Copyright (C) 2008 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 96 matching lines @@
     if (isActive()) {
         if (repeatInterval() && repeatInterval() < minimumInterval) {
             m_nestingLevel++;
             if (m_nestingLevel >= maxTimerNestingLevel)
                 augmentRepeatInterval(minimumInterval - repeatInterval());
         }
 
         WTF_LOG(Timers, "DOMTimer::fired: m_timeoutID = %d, repeatInterval = %f, m_action = %p", m_timeoutID, repeatInterval(), m_action.get());
 
         // No access to member variables after this point, it can delete the timer.
-        m_action->execute(context);
+        m_action->Execute(context);
         return;
     }
 
     WTF_LOG(Timers, "DOMTimer::fired: m_timeoutID = %d, one-shot, m_action = %p", m_timeoutID, m_action.get());
 
     // Delete timer before executing the action for one-shot timers.
     OwnPtr<ScheduledAction> action = m_action.release();
 
     // This timer is being deleted; no access to member variables allowed after this point.
     context->removeTimeoutByID(m_timeoutID);
 
-    action->execute(context);
+    action->Execute(context);
 
     timerNestingLevel = 0;
 }
 
 void DOMTimer::contextDestroyed()
 {
     SuspendableTimer::contextDestroyed();
 }
 
 void DOMTimer::stop()
@@ skipping 35 matching lines @@
         if (fireTime - alignedTimeRoundedDown < minimumInterval)
             return alignedTimeRoundedDown;
 
         return alignedTimeRoundedUp;
     }
 
     return fireTime;
 }
 
 } // namespace blink