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