CL for perf tryjob on win

third_party/WebKit/Source/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 54 matching lines @@
     TRACE_EVENT_INSTANT1("devtools.timeline", "TimerRemove", TRACE_EVENT_SCOPE_THREAD, "data", InspectorTimerRemoveEvent::data(context, timeoutID));
     InspectorInstrumentation::didRemoveTimer(context, timeoutID);
 }
 
 DOMTimer::DOMTimer(ExecutionContext* context, PassOwnPtrWillBeRawPtr<ScheduledAction> action, int interval, bool singleShot, int timeoutID)
     : SuspendableTimer(context)
     , m_timeoutID(timeoutID)
     , m_nestingLevel(context->timers()->timerNestingLevel() + 1)
     , m_action(action)
 {
+    // Store the creating worldId, as the timer is fired in the main world.
+    ASSERT(v8::Isolate::GetCurrent()->InContext());
+    m_originWorldId = DOMWrapperWorld::current(v8::Isolate::GetCurrent()).originWorldId();
+
     ASSERT(timeoutID > 0);
     if (shouldForwardUserGesture(interval, m_nestingLevel))
         m_userGestureToken = UserGestureIndicator::currentToken();
 
     double intervalMilliseconds = std::max(oneMillisecond, interval * oneMillisecond);
     if (intervalMilliseconds < minimumInterval && m_nestingLevel >= maxTimerNestingLevel)
         intervalMilliseconds = minimumInterval;
     if (singleShot)
         startOneShot(intervalMilliseconds, BLINK_FROM_HERE);
     else
@@ skipping 12 matching lines @@
 }
 
 void DOMTimer::fired()
 {
     ExecutionContext* context = executionContext();
     ASSERT(context);
     context->timers()->setTimerNestingLevel(m_nestingLevel);
     ASSERT(!context->activeDOMObjectsAreSuspended());
     // Only the first execution of a multi-shot timer should get an affirmative user gesture indicator.
     UserGestureIndicator gestureIndicator(m_userGestureToken.release());
+    // Ensure the parent world id gets propagated to the action and is reset afterwards.
+    DOMWrapperWorld::ParentWorldIdPusher worldIdPusher(ScriptState::forMainWorld(toDocument(context)->frame())->world(), m_originWorldId);
 
     TRACE_EVENT1("devtools.timeline", "TimerFire", "data", InspectorTimerFireEvent::data(context, m_timeoutID));
     InspectorInstrumentationCookie cookie = InspectorInstrumentation::willFireTimer(context, m_timeoutID);
 
     // Simple case for non-one-shot timers.
     if (isActive()) {
         if (repeatInterval() && repeatInterval() < minimumInterval) {
             m_nestingLevel++;
             if (m_nestingLevel >= maxTimerNestingLevel)
                 augmentRepeatInterval(minimumInterval - repeatInterval());
@@ skipping 38 matching lines @@
     return executionContext()->timers()->timerTaskRunner();
 }
 
 DEFINE_TRACE(DOMTimer)
 {
     visitor->trace(m_action);
     SuspendableTimer::trace(visitor);
 }
 
 } // namespace blink