OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 MEDIA_BASE_TEXT_RENDERER_H_ | 5 #ifndef MEDIA_BASE_TEXT_RENDERER_H_ |
6 #define MEDIA_BASE_TEXT_RENDERER_H_ | 6 #define MEDIA_BASE_TEXT_RENDERER_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 | 10 |
11 #include "base/callback.h" | 11 #include "base/callback.h" |
| 12 #include "base/macros.h" |
12 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
13 #include "base/memory/weak_ptr.h" | 14 #include "base/memory/weak_ptr.h" |
14 #include "media/base/demuxer_stream.h" | 15 #include "media/base/demuxer_stream.h" |
15 #include "media/base/media_export.h" | 16 #include "media/base/media_export.h" |
16 #include "media/base/pipeline_status.h" | 17 #include "media/base/pipeline_status.h" |
17 #include "media/base/text_ranges.h" | 18 #include "media/base/text_ranges.h" |
18 #include "media/base/text_track.h" | 19 #include "media/base/text_track.h" |
19 | 20 |
20 namespace base { | 21 namespace base { |
21 class SingleThreadTaskRunner; | 22 class SingleThreadTaskRunner; |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 | 133 |
133 // NOTE: Weak pointers must be invalidated before all other member variables. | 134 // NOTE: Weak pointers must be invalidated before all other member variables. |
134 base::WeakPtrFactory<TextRenderer> weak_factory_; | 135 base::WeakPtrFactory<TextRenderer> weak_factory_; |
135 | 136 |
136 DISALLOW_IMPLICIT_CONSTRUCTORS(TextRenderer); | 137 DISALLOW_IMPLICIT_CONSTRUCTORS(TextRenderer); |
137 }; | 138 }; |
138 | 139 |
139 } // namespace media | 140 } // namespace media |
140 | 141 |
141 #endif // MEDIA_BASE_TEXT_RENDERER_H_ | 142 #endif // MEDIA_BASE_TEXT_RENDERER_H_ |
OLD | NEW |