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

Side by Side Diff: Source/core/dom/MutationObserver.cpp

Issue 657983002: Fix crash in MutationObserver::canDeliver due to NULL ExecutionContext (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/MutationCallback.h ('k') | 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 WillBeHeapHashSet<RawPtrWillBeMember<Node> > MutationObserver::getObservedNodes( ) const 202 WillBeHeapHashSet<RawPtrWillBeMember<Node> > MutationObserver::getObservedNodes( ) const
203 { 203 {
204 WillBeHeapHashSet<RawPtrWillBeMember<Node> > observedNodes; 204 WillBeHeapHashSet<RawPtrWillBeMember<Node> > observedNodes;
205 for (MutationObserverRegistrationSet::const_iterator iter = m_registrations. begin(); iter != m_registrations.end(); ++iter) 205 for (MutationObserverRegistrationSet::const_iterator iter = m_registrations. begin(); iter != m_registrations.end(); ++iter)
206 (*iter)->addRegistrationNodesToSet(observedNodes); 206 (*iter)->addRegistrationNodesToSet(observedNodes);
207 return observedNodes; 207 return observedNodes;
208 } 208 }
209 209
210 bool MutationObserver::canDeliver() 210 bool MutationObserver::canDeliver()
211 { 211 {
212 return !m_callback->executionContext()->activeDOMObjectsAreSuspended(); 212 return m_callback->canInvokeCallback();
213 } 213 }
214 214
215 void MutationObserver::deliver() 215 void MutationObserver::deliver()
216 { 216 {
217 ASSERT(canDeliver()); 217 ASSERT(canDeliver());
218 218
219 // Calling clearTransientRegistrations() can modify m_registrations, so it's necessary 219 // Calling clearTransientRegistrations() can modify m_registrations, so it's necessary
220 // to make a copy of the transient registrations before operating on them. 220 // to make a copy of the transient registrations before operating on them.
221 WillBeHeapVector<RawPtrWillBeMember<MutationObserverRegistration>, 1> transi entRegistrations; 221 WillBeHeapVector<RawPtrWillBeMember<MutationObserverRegistration>, 1> transi entRegistrations;
222 for (MutationObserverRegistrationSet::iterator iter = m_registrations.begin( ); iter != m_registrations.end(); ++iter) { 222 for (MutationObserverRegistrationSet::iterator iter = m_registrations.begin( ); iter != m_registrations.end(); ++iter) {
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 270
271 void MutationObserver::trace(Visitor* visitor) 271 void MutationObserver::trace(Visitor* visitor)
272 { 272 {
273 #if ENABLE(OILPAN) 273 #if ENABLE(OILPAN)
274 visitor->trace(m_records); 274 visitor->trace(m_records);
275 visitor->trace(m_registrations); 275 visitor->trace(m_registrations);
276 #endif 276 #endif
277 } 277 }
278 278
279 } // namespace blink 279 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/MutationCallback.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698