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

Side by Side Diff: Source/WebCore/page/DOMTimer.cpp

Issue 9317088: Merge 106636 - Crash when trying to add a timer to a detached document. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 * 24 *
25 */ 25 */
26 26
27 #include "config.h" 27 #include "config.h"
28 #include "DOMTimer.h" 28 #include "DOMTimer.h"
29 29
30 #include "Document.h"
30 #include "InspectorInstrumentation.h" 31 #include "InspectorInstrumentation.h"
31 #include "ScheduledAction.h" 32 #include "ScheduledAction.h"
32 #include "ScriptExecutionContext.h" 33 #include "ScriptExecutionContext.h"
33 #include "UserGestureIndicator.h" 34 #include "UserGestureIndicator.h"
34 #include <wtf/HashSet.h> 35 #include <wtf/HashSet.h>
35 #include <wtf/StdLibExtras.h> 36 #include <wtf/StdLibExtras.h>
36 37
37 using namespace std; 38 using namespace std;
38 39
39 namespace WebCore { 40 namespace WebCore {
(...skipping 23 matching lines...) Expand all
63 } 64 }
64 65
65 DOMTimer::DOMTimer(ScriptExecutionContext* context, PassOwnPtr<ScheduledAction> action, int interval, bool singleShot) 66 DOMTimer::DOMTimer(ScriptExecutionContext* context, PassOwnPtr<ScheduledAction> action, int interval, bool singleShot)
66 : SuspendableTimer(context) 67 : SuspendableTimer(context)
67 , m_timeoutId(timeoutId()) 68 , m_timeoutId(timeoutId())
68 , m_nestingLevel(timerNestingLevel + 1) 69 , m_nestingLevel(timerNestingLevel + 1)
69 , m_action(action) 70 , m_action(action)
70 , m_originalInterval(interval) 71 , m_originalInterval(interval)
71 , m_shouldForwardUserGesture(shouldForwardUserGesture(interval, m_nestingLev el)) 72 , m_shouldForwardUserGesture(shouldForwardUserGesture(interval, m_nestingLev el))
72 { 73 {
74 // FIXME: remove once we found out the root cause for http://webkit.org/b/77 370
75 if (scriptExecutionContext()->isDocument() && !static_cast<Document*>(script ExecutionContext())->frame())
76 CRASH();
73 scriptExecutionContext()->addTimeout(m_timeoutId, this); 77 scriptExecutionContext()->addTimeout(m_timeoutId, this);
74 78
75 double intervalMilliseconds = intervalClampedToMinimum(interval, context->mi nimumTimerInterval()); 79 double intervalMilliseconds = intervalClampedToMinimum(interval, context->mi nimumTimerInterval());
76 if (singleShot) 80 if (singleShot)
77 startOneShot(intervalMilliseconds); 81 startOneShot(intervalMilliseconds);
78 else 82 else
79 startRepeating(intervalMilliseconds); 83 startRepeating(intervalMilliseconds);
80 } 84 }
81 85
82 DOMTimer::~DOMTimer() 86 DOMTimer::~DOMTimer()
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 double DOMTimer::intervalClampedToMinimum(int timeout, double minimumTimerInterv al) const 191 double DOMTimer::intervalClampedToMinimum(int timeout, double minimumTimerInterv al) const
188 { 192 {
189 double intervalMilliseconds = max(oneMillisecond, timeout * oneMillisecond); 193 double intervalMilliseconds = max(oneMillisecond, timeout * oneMillisecond);
190 194
191 if (intervalMilliseconds < minimumTimerInterval && m_nestingLevel >= maxTime rNestingLevel) 195 if (intervalMilliseconds < minimumTimerInterval && m_nestingLevel >= maxTime rNestingLevel)
192 intervalMilliseconds = minimumTimerInterval; 196 intervalMilliseconds = minimumTimerInterval;
193 return intervalMilliseconds; 197 return intervalMilliseconds;
194 } 198 }
195 199
196 } // namespace WebCore 200 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698