| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H | 5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H |
| 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H | 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H |
| 7 | 7 |
| 8 #include <stddef.h> |
| 9 |
| 8 #include <map> | 10 #include <map> |
| 9 #include <vector> | 11 #include <vector> |
| 10 | 12 |
| 11 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 12 #include "base/memory/weak_ptr.h" | 14 #include "base/memory/weak_ptr.h" |
| 13 #include "base/message_loop/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
| 14 #include "base/synchronization/lock.h" | 16 #include "base/synchronization/lock.h" |
| 15 #include "base/threading/thread_checker.h" | 17 #include "base/threading/thread_checker.h" |
| 16 #include "cc/layers/video_frame_provider.h" | 18 #include "cc/layers/video_frame_provider.h" |
| 17 #include "content/common/content_export.h" | 19 #include "content/common/content_export.h" |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 | 145 |
| 144 std::map<base::TimeDelta, base::TimeTicks> timestamps_to_clock_times_; | 146 std::map<base::TimeDelta, base::TimeTicks> timestamps_to_clock_times_; |
| 145 | 147 |
| 146 // |current_frame_lock_| protects |current_frame_used_by_compositor_|, | 148 // |current_frame_lock_| protects |current_frame_used_by_compositor_|, |
| 147 // |current_frame_|, and |rendering_frame_buffer_|. | 149 // |current_frame_|, and |rendering_frame_buffer_|. |
| 148 base::Lock current_frame_lock_; | 150 base::Lock current_frame_lock_; |
| 149 }; | 151 }; |
| 150 } | 152 } |
| 151 | 153 |
| 152 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H | 154 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H |
| OLD | NEW |