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

Side by Side Diff: third_party/WebKit/WebCore/dom/ScriptExecutionContext.cpp

Issue 20076: WebKit merge 40500:40539 [WebKit side] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 | Annotate | Revision Log
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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 { 168 {
169 ASSERT(object); 169 ASSERT(object);
170 m_activeDOMObjects.remove(object); 170 m_activeDOMObjects.remove(object);
171 } 171 }
172 172
173 void ScriptExecutionContext::setSecurityOrigin(PassRefPtr<SecurityOrigin> securi tyOrigin) 173 void ScriptExecutionContext::setSecurityOrigin(PassRefPtr<SecurityOrigin> securi tyOrigin)
174 { 174 {
175 m_securityOrigin = securityOrigin; 175 m_securityOrigin = securityOrigin;
176 } 176 }
177 177
178 void ScriptExecutionContext::addTimeout(int timeoutId, DOMTimer* timer)
179 {
180 ASSERT(!m_timeouts.contains(timeoutId));
181 m_timeouts.set(timeoutId, timer);
182 }
183
184 void ScriptExecutionContext::removeTimeout(int timeoutId)
185 {
186 m_timeouts.remove(timeoutId);
187 }
188
189 DOMTimer* ScriptExecutionContext::findTimeout(int timeoutId)
190 {
191 return m_timeouts.get(timeoutId);
192 }
193
178 ScriptExecutionContext::Task::~Task() 194 ScriptExecutionContext::Task::~Task()
179 { 195 {
180 } 196 }
181 197
182 } // namespace WebCore 198 } // namespace WebCore
183 199
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/dom/ScriptExecutionContext.h ('k') | third_party/WebKit/WebCore/dom/Worker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698