OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google, Inc. All Rights Reserved. | 2 * Copyright (C) 2010 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 | 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 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 | 220 |
221 postTaskIfOneIsNotAlreadyInFlight(); | 221 postTaskIfOneIsNotAlreadyInFlight(); |
222 return true; | 222 return true; |
223 } | 223 } |
224 | 224 |
225 void ScriptRunner::postTaskIfOneIsNotAlreadyInFlight() | 225 void ScriptRunner::postTaskIfOneIsNotAlreadyInFlight() |
226 { | 226 { |
227 if (m_executeScriptsTaskFactory.isPending()) | 227 if (m_executeScriptsTaskFactory.isPending()) |
228 return; | 228 return; |
229 | 229 |
230 // FIXME: Rename task() so that it's obvious it cancels any pending task. | 230 Platform::current()->currentThread()->scheduler()->loadingTaskRunner()->post
Task(FROM_HERE, m_executeScriptsTaskFactory.cancelAndCreate()); |
231 Platform::current()->currentThread()->scheduler()->postLoadingTask(FROM_HERE
, m_executeScriptsTaskFactory.cancelAndCreate()); | |
232 } | 231 } |
233 | 232 |
234 DEFINE_TRACE(ScriptRunner) | 233 DEFINE_TRACE(ScriptRunner) |
235 { | 234 { |
236 #if ENABLE(OILPAN) | 235 #if ENABLE(OILPAN) |
237 visitor->trace(m_document); | 236 visitor->trace(m_document); |
238 visitor->trace(m_scriptsToExecuteInOrder); | 237 visitor->trace(m_scriptsToExecuteInOrder); |
239 visitor->trace(m_scriptsToExecuteSoon); | 238 visitor->trace(m_scriptsToExecuteSoon); |
240 visitor->trace(m_pendingAsyncScripts); | 239 visitor->trace(m_pendingAsyncScripts); |
241 #endif | 240 #endif |
242 } | 241 } |
243 | 242 |
244 } | 243 } |
OLD | NEW |