| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_ | 5 #ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_ |
| 6 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_ | 6 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_ |
| 7 | 7 |
| 8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
| 11 #include "base/synchronization/lock.h" | 11 #include "base/synchronization/lock.h" |
| 12 #include "base/threading/thread_checker.h" |
| 12 #include "googleurl/src/gurl.h" | 13 #include "googleurl/src/gurl.h" |
| 13 #include "media/filters/skcanvas_video_renderer.h" | 14 #include "media/filters/skcanvas_video_renderer.h" |
| 14 #include "skia/ext/platform_canvas.h" | 15 #include "skia/ext/platform_canvas.h" |
| 15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" | 16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" |
| 16 | 17 |
| 17 namespace WebKit { | 18 namespace WebKit { |
| 18 class WebFrame; | 19 class WebFrame; |
| 19 class WebMediaPlayerClient; | 20 class WebMediaPlayerClient; |
| 20 class WebVideoFrame; | 21 class WebVideoFrame; |
| 21 } | 22 } |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 // Used to auto mute the local media streams when getting the first | 177 // Used to auto mute the local media streams when getting the first |
| 177 // SetVolume() from WebMediaPlayer. | 178 // SetVolume() from WebMediaPlayer. |
| 178 bool volume_modified_; | 179 bool volume_modified_; |
| 179 | 180 |
| 180 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); | 181 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); |
| 181 }; | 182 }; |
| 182 | 183 |
| 183 } // namespace webkit_media | 184 } // namespace webkit_media |
| 184 | 185 |
| 185 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_ | 186 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_ |
| OLD | NEW |