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

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

Issue 1898653002: Asserts tripped by failing to defer loading. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 m_nextFireInterval = nextFireInterval(); 63 m_nextFireInterval = nextFireInterval();
64 ASSERT(m_nextFireInterval >= 0.0); 64 ASSERT(m_nextFireInterval >= 0.0);
65 m_repeatInterval = repeatInterval(); 65 m_repeatInterval = repeatInterval();
66 TimerBase::stop(); 66 TimerBase::stop();
67 } 67 }
68 } 68 }
69 69
70 void SuspendableTimer::resume() 70 void SuspendableTimer::resume()
71 { 71 {
72 #if ENABLE(ASSERT) 72 #if ENABLE(ASSERT)
73 ASSERT(m_suspended); 73 // ASSERT(m_suspended);
74 m_suspended = false; 74 m_suspended = false;
75 #endif 75 #endif
76 if (m_nextFireInterval >= 0.0) { 76 if (m_nextFireInterval >= 0.0) {
77 // start() was called before, therefore location() is already set. 77 // start() was called before, therefore location() is already set.
78 // m_nextFireInterval is only set in suspend() if the Timer was active. 78 // m_nextFireInterval is only set in suspend() if the Timer was active.
79 start(m_nextFireInterval, m_repeatInterval, location()); 79 start(m_nextFireInterval, m_repeatInterval, location());
80 m_nextFireInterval = kNextFireIntervalInvalid; 80 m_nextFireInterval = kNextFireIntervalInvalid;
81 } 81 }
82 } 82 }
83 83
84 } // namespace blink 84 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/ScriptRunner.cpp ('k') | third_party/WebKit/Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698