Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(288)

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp

Issue 1477353002: Revert of Move throttling of background timers into the renderer scheduler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 // (see DOMTimer comment for more.) 142 // (see DOMTimer comment for more.)
143 EAGERLY_FINALIZE(); 143 EAGERLY_FINALIZE();
144 DEFINE_INLINE_VIRTUAL_TRACE() 144 DEFINE_INLINE_VIRTUAL_TRACE()
145 { 145 {
146 visitor->trace(m_event); 146 visitor->trace(m_event);
147 visitor->trace(m_window); 147 visitor->trace(m_window);
148 visitor->trace(m_stackTrace); 148 visitor->trace(m_stackTrace);
149 SuspendableTimer::trace(visitor); 149 SuspendableTimer::trace(visitor);
150 } 150 }
151 151
152 // TODO(alexclarke): Override timerTaskRunner() to pass in a document specif ic default task runner. 152 WebTaskRunner* timerTaskRunner() override
153 {
154 return m_window->document()->timerTaskRunner();
155 }
153 156
154 private: 157 private:
155 void fired() override 158 void fired() override
156 { 159 {
157 InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceA syncOperationCompletedCallbackStarting(executionContext(), m_asyncOperationId); 160 InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceA syncOperationCompletedCallbackStarting(executionContext(), m_asyncOperationId);
158 // Prevent calls to stop triggered from the event handler to 161 // Prevent calls to stop triggered from the event handler to
159 // kill this object. 162 // kill this object.
160 m_preventDestruction = true; 163 m_preventDestruction = true;
161 m_window->postMessageTimerFired(this); 164 m_window->postMessageTimerFired(this);
162 // Will destroy this object 165 // Will destroy this object
(...skipping 1365 matching lines...) Expand 10 before | Expand all | Expand 10 after
1528 { 1531 {
1529 // If the LocalDOMWindow still has a frame reference, that frame must point 1532 // If the LocalDOMWindow still has a frame reference, that frame must point
1530 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation 1533 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation
1531 // where script execution leaks between different LocalDOMWindows. 1534 // where script execution leaks between different LocalDOMWindows.
1532 if (m_frameObserver->frame()) 1535 if (m_frameObserver->frame())
1533 ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWindow() = = this); 1536 ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWindow() = = this);
1534 return m_frameObserver->frame(); 1537 return m_frameObserver->frame();
1535 } 1538 }
1536 1539
1537 } // namespace blink 1540 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698