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

Side by Side Diff: media/renderers/mock_gpu_video_accelerator_factories.h

Issue 1445003002: Use std::default_delete as the default deleter for scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: How many trial and errors before this builds on the Windows bots Created 5 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/filters/vp9_parser.cc ('k') | media/video/video_decode_accelerator.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 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_RENDERERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ 5 #ifndef MEDIA_RENDERERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
6 #define MEDIA_RENDERERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ 6 #define MEDIA_RENDERERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
7 7
8 #include "base/memory/ref_counted.h"
8 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
9 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
10 #include "media/renderers/gpu_video_accelerator_factories.h" 11 #include "media/renderers/gpu_video_accelerator_factories.h"
11 #include "media/video/video_decode_accelerator.h" 12 #include "media/video/video_decode_accelerator.h"
12 #include "media/video/video_encode_accelerator.h" 13 #include "media/video/video_encode_accelerator.h"
13 #include "testing/gmock/include/gmock/gmock.h" 14 #include "testing/gmock/include/gmock/gmock.h"
14 15
15 template <class T>
16 class scoped_refptr;
17
18 namespace base { 16 namespace base {
19 class SharedMemory; 17 class SharedMemory;
20 } 18 }
21 19
22 namespace media { 20 namespace media {
23 21
24 class MockGpuVideoAcceleratorFactories : public GpuVideoAcceleratorFactories { 22 class MockGpuVideoAcceleratorFactories : public GpuVideoAcceleratorFactories {
25 public: 23 public:
26 explicit MockGpuVideoAcceleratorFactories(gpu::gles2::GLES2Interface* gles2); 24 explicit MockGpuVideoAcceleratorFactories(gpu::gles2::GLES2Interface* gles2);
27 ~MockGpuVideoAcceleratorFactories() override; 25 ~MockGpuVideoAcceleratorFactories() override;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 VideoPixelFormat video_frame_output_format_ = PIXEL_FORMAT_I420; 82 VideoPixelFormat video_frame_output_format_ = PIXEL_FORMAT_I420;
85 83
86 bool fail_to_allocate_gpu_memory_buffer_ = false; 84 bool fail_to_allocate_gpu_memory_buffer_ = false;
87 85
88 gpu::gles2::GLES2Interface* gles2_; 86 gpu::gles2::GLES2Interface* gles2_;
89 }; 87 };
90 88
91 } // namespace media 89 } // namespace media
92 90
93 #endif // MEDIA_RENDERERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ 91 #endif // MEDIA_RENDERERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
OLDNEW
« no previous file with comments | « media/filters/vp9_parser.cc ('k') | media/video/video_decode_accelerator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698