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

Side by Side Diff: content/renderer/media/canvas_capture_handler.h

Issue 2354903003: Don't include the tracing in gpu_memory_buffer.h (Closed)
Patch Set: Fix linux build again Created 4 years, 3 months 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
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 #ifndef CONTENT_RENDERER_MEDIA_CANVAS_CAPTURE_HANDLER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CANVAS_CAPTURE_HANDLER_H_
6 #define CONTENT_RENDERER_MEDIA_CANVAS_CAPTURE_HANDLER_H_ 6 #define CONTENT_RENDERER_MEDIA_CANVAS_CAPTURE_HANDLER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <memory> 11 #include <memory>
12 12
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/memory/weak_ptr.h"
16 #include "base/single_thread_task_runner.h"
15 #include "base/threading/thread_checker.h" 17 #include "base/threading/thread_checker.h"
16 #include "content/common/content_export.h" 18 #include "content/common/content_export.h"
17 #include "media/base/video_capturer_source.h" 19 #include "media/base/video_capturer_source.h"
18 #include "media/base/video_frame_pool.h" 20 #include "media/base/video_frame_pool.h"
19 #include "third_party/WebKit/public/platform/WebCanvasCaptureHandler.h" 21 #include "third_party/WebKit/public/platform/WebCanvasCaptureHandler.h"
20 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 22 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
21 #include "third_party/WebKit/public/platform/WebSize.h" 23 #include "third_party/WebKit/public/platform/WebSize.h"
22 #include "third_party/skia/include/core/SkImageInfo.h" 24 #include "third_party/skia/include/core/SkImageInfo.h"
23 25
24 class SkImage; 26 class SkImage;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 // Bound to Main Render thread. 100 // Bound to Main Render thread.
99 base::ThreadChecker main_render_thread_checker_; 101 base::ThreadChecker main_render_thread_checker_;
100 base::WeakPtrFactory<CanvasCaptureHandler> weak_ptr_factory_; 102 base::WeakPtrFactory<CanvasCaptureHandler> weak_ptr_factory_;
101 103
102 DISALLOW_COPY_AND_ASSIGN(CanvasCaptureHandler); 104 DISALLOW_COPY_AND_ASSIGN(CanvasCaptureHandler);
103 }; 105 };
104 106
105 } // namespace content 107 } // namespace content
106 108
107 #endif // CONTENT_RENDERER_MEDIA_CANVAS_CAPTURE_HANDLER_H_ 109 #endif // CONTENT_RENDERER_MEDIA_CANVAS_CAPTURE_HANDLER_H_
OLDNEW
« no previous file with comments | « content/browser/gpu/browser_gpu_memory_buffer_manager.cc ('k') | content/renderer/media/canvas_capture_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698