| OLD | NEW |
| 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 | 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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 InspectorInstrumentation::didFireAnimationFrame(cookie); | 166 InspectorInstrumentation::didFireAnimationFrame(cookie); |
| 167 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"),
"UpdateCounters", "data", InspectorUpdateCountersEvent::data()); | 167 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"),
"UpdateCounters", "data", InspectorUpdateCountersEvent::data()); |
| 168 } | 168 } |
| 169 } | 169 } |
| 170 | 170 |
| 171 m_callbacksToInvoke.clear(); | 171 m_callbacksToInvoke.clear(); |
| 172 } | 172 } |
| 173 | 173 |
| 174 void ScriptedAnimationController::callMediaQueryListListeners() | 174 void ScriptedAnimationController::callMediaQueryListListeners() |
| 175 { | 175 { |
| 176 ASSERT(m_mediaQueryListListeners.size()); |
| 176 MediaQueryListListeners listeners; | 177 MediaQueryListListeners listeners; |
| 177 listeners.swap(m_mediaQueryListListeners); | 178 listeners.swap(m_mediaQueryListListeners); |
| 178 | 179 |
| 179 for (MediaQueryListListeners::const_iterator it = listeners.begin(), end = l
isteners.end(); | 180 for (MediaQueryListListeners::const_iterator it = listeners.begin(), end = l
isteners.end(); |
| 180 it != end; ++it) { | 181 it != end; ++it) { |
| 181 (*it)->call(); | 182 (*it)->call(); |
| 182 } | 183 } |
| 183 } | 184 } |
| 184 | 185 |
| 185 void ScriptedAnimationController::serviceScriptedAnimations(double monotonicTime
Now) | 186 void ScriptedAnimationController::serviceScriptedAnimations(double monotonicTime
Now) |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 return; | 231 return; |
| 231 | 232 |
| 232 if (!m_callbacks.size() && !m_eventQueue.size() && !m_mediaQueryListListener
s.size()) | 233 if (!m_callbacks.size() && !m_eventQueue.size() && !m_mediaQueryListListener
s.size()) |
| 233 return; | 234 return; |
| 234 | 235 |
| 235 if (FrameView* frameView = m_document->view()) | 236 if (FrameView* frameView = m_document->view()) |
| 236 frameView->scheduleAnimation(); | 237 frameView->scheduleAnimation(); |
| 237 } | 238 } |
| 238 | 239 |
| 239 } | 240 } |
| OLD | NEW |