Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(504)

Side by Side Diff: media/blink/video_frame_compositor.h

Issue 1535193003: Add missing macros includes in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/blink/texttrack_impl.h ('k') | media/blink/webaudiosourceprovider_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_BLINK_VIDEO_FRAME_COMPOSITOR_H_ 5 #ifndef MEDIA_BLINK_VIDEO_FRAME_COMPOSITOR_H_
6 #define MEDIA_BLINK_VIDEO_FRAME_COMPOSITOR_H_ 6 #define MEDIA_BLINK_VIDEO_FRAME_COMPOSITOR_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/macros.h"
9 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
10 #include "base/single_thread_task_runner.h" 11 #include "base/single_thread_task_runner.h"
11 #include "base/synchronization/lock.h" 12 #include "base/synchronization/lock.h"
12 #include "base/time/tick_clock.h" 13 #include "base/time/tick_clock.h"
13 #include "base/timer/timer.h" 14 #include "base/timer/timer.h"
14 #include "cc/layers/video_frame_provider.h" 15 #include "cc/layers/video_frame_provider.h"
15 #include "media/base/video_renderer_sink.h" 16 #include "media/base/video_renderer_sink.h"
16 #include "media/blink/media_blink_export.h" 17 #include "media/blink/media_blink_export.h"
17 #include "ui/gfx/geometry/size.h" 18 #include "ui/gfx/geometry/size.h"
18 19
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 // These values are updated and read from the media and compositor threads. 176 // These values are updated and read from the media and compositor threads.
176 base::Lock callback_lock_; 177 base::Lock callback_lock_;
177 VideoRendererSink::RenderCallback* callback_; 178 VideoRendererSink::RenderCallback* callback_;
178 179
179 DISALLOW_COPY_AND_ASSIGN(VideoFrameCompositor); 180 DISALLOW_COPY_AND_ASSIGN(VideoFrameCompositor);
180 }; 181 };
181 182
182 } // namespace media 183 } // namespace media
183 184
184 #endif // MEDIA_BLINK_VIDEO_FRAME_COMPOSITOR_H_ 185 #endif // MEDIA_BLINK_VIDEO_FRAME_COMPOSITOR_H_
OLDNEW
« no previous file with comments | « media/blink/texttrack_impl.h ('k') | media/blink/webaudiosourceprovider_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698