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

Side by Side Diff: media/renderers/video_overlay_factory.cc

Issue 2443103003: Remove unused include in sequenced_worker_pool.h (Closed)
Patch Set: merge up to r429325 Created 4 years, 1 month 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/base/media_url_demuxer.cc ('k') | net/base/upload_file_element_reader.cc » ('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 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 #include "media/renderers/video_overlay_factory.h" 5 #include "media/renderers/video_overlay_factory.h"
6 6
7 #include "base/single_thread_task_runner.h"
7 #include "gpu/GLES2/gl2extchromium.h" 8 #include "gpu/GLES2/gl2extchromium.h"
8 #include "gpu/command_buffer/client/gles2_interface.h" 9 #include "gpu/command_buffer/client/gles2_interface.h"
9 #include "gpu/command_buffer/common/mailbox.h" 10 #include "gpu/command_buffer/common/mailbox.h"
10 #include "gpu/command_buffer/common/sync_token.h" 11 #include "gpu/command_buffer/common/sync_token.h"
11 #include "media/base/video_frame.h" 12 #include "media/base/video_frame.h"
12 #include "media/renderers/gpu_video_accelerator_factories.h" 13 #include "media/renderers/gpu_video_accelerator_factories.h"
13 14
14 namespace media { 15 namespace media {
15 16
16 class VideoOverlayFactory::Texture { 17 class VideoOverlayFactory::Texture {
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 return nullptr; 112 return nullptr;
112 113
113 // Lazily create overlay texture. 114 // Lazily create overlay texture.
114 if (!texture_) 115 if (!texture_)
115 texture_.reset(new Texture(gpu_factories_)); 116 texture_.reset(new Texture(gpu_factories_));
116 117
117 return texture_->IsValid() ? texture_.get() : nullptr; 118 return texture_->IsValid() ? texture_.get() : nullptr;
118 } 119 }
119 120
120 } // namespace media 121 } // namespace media
OLDNEW
« no previous file with comments | « media/base/media_url_demuxer.cc ('k') | net/base/upload_file_element_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698