| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 double startTime; | 196 double startTime; |
| 197 double holdTime; | 197 double holdTime; |
| 198 double playbackRate; | 198 double playbackRate; |
| 199 bool sourceChanged; | 199 bool sourceChanged; |
| 200 CompositorAction pendingAction; | 200 CompositorAction pendingAction; |
| 201 }; | 201 }; |
| 202 | 202 |
| 203 // This mirrors the known compositor state. It is created when a compositor | 203 // This mirrors the known compositor state. It is created when a compositor |
| 204 // animation is started. Updated once the start time is known and each time | 204 // animation is started. Updated once the start time is known and each time |
| 205 // modifications are pushed to the compositor. | 205 // modifications are pushed to the compositor. |
| 206 OwnPtrWillBeMember<CompositorState> m_compositorState; | 206 OwnPtr<CompositorState> m_compositorState; |
| 207 bool m_compositorPending; | 207 bool m_compositorPending; |
| 208 bool m_currentTimePending; | 208 bool m_currentTimePending; |
| 209 }; | 209 }; |
| 210 | 210 |
| 211 } // namespace blink | 211 } // namespace blink |
| 212 | 212 |
| 213 #endif | 213 #endif |
| OLD | NEW |