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

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/ScheduledAction.cpp

Issue 2552673002: Eagerly dispose of ScheduledActions (reland.) (Closed)
Patch Set: Add assert Created 4 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) 2007-2009 Google Inc. All rights reserved. 2 * Copyright (C) 2007-2009 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 ScheduledAction* ScheduledAction::create(ScriptState* scriptState, 55 ScheduledAction* ScheduledAction::create(ScriptState* scriptState,
56 const String& handler) { 56 const String& handler) {
57 return new ScheduledAction(scriptState, handler); 57 return new ScheduledAction(scriptState, handler);
58 } 58 }
59 59
60 DEFINE_TRACE(ScheduledAction) { 60 DEFINE_TRACE(ScheduledAction) {
61 visitor->trace(m_code); 61 visitor->trace(m_code);
62 } 62 }
63 63
64 ScheduledAction::~ScheduledAction() {} 64 ScheduledAction::~ScheduledAction() {
65 // Verify that owning DOMTimer has eagerly disposed.
66 DCHECK(m_info.IsEmpty());
67 }
68
69 void ScheduledAction::dispose() {
70 m_code.dispose();
71 m_info.Clear();
72 m_function.clear();
73 m_scriptState.clear();
74 }
65 75
66 void ScheduledAction::execute(ExecutionContext* context) { 76 void ScheduledAction::execute(ExecutionContext* context) {
67 if (context->isDocument()) { 77 if (context->isDocument()) {
68 LocalFrame* frame = toDocument(context)->frame(); 78 LocalFrame* frame = toDocument(context)->frame();
69 if (!frame) { 79 if (!frame) {
70 DVLOG(1) << "ScheduledAction::execute " << this << ": no frame"; 80 DVLOG(1) << "ScheduledAction::execute " << this << ": no frame";
71 return; 81 return;
72 } 82 }
73 if (!frame->script().canExecuteScripts(AboutToExecuteScript)) { 83 if (!frame->script().canExecuteScripts(AboutToExecuteScript)) {
74 DVLOG(1) << "ScheduledAction::execute " << this 84 DVLOG(1) << "ScheduledAction::execute " << this
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 } 176 }
167 177
168 void ScheduledAction::createLocalHandlesForArgs( 178 void ScheduledAction::createLocalHandlesForArgs(
169 Vector<v8::Local<v8::Value>>* handles) { 179 Vector<v8::Local<v8::Value>>* handles) {
170 handles->reserveCapacity(m_info.Size()); 180 handles->reserveCapacity(m_info.Size());
171 for (size_t i = 0; i < m_info.Size(); ++i) 181 for (size_t i = 0; i < m_info.Size(); ++i)
172 handles->append(m_info.Get(i)); 182 handles->append(m_info.Get(i));
173 } 183 }
174 184
175 } // namespace blink 185 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698