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

Side by Side Diff: cc/video_layer_impl.h

Issue 11615020: Clean up cc and webkit/compositor_bindings include path shenanigans (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 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 | Annotate | Revision Log
« no previous file with comments | « cc/thread_proxy.cc ('k') | webkit/compositor_bindings/compositor_bindings.gyp » ('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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 CC_VIDEO_LAYER_IMPL_H_ 5 #ifndef CC_VIDEO_LAYER_IMPL_H_
6 #define CC_VIDEO_LAYER_IMPL_H_ 6 #define CC_VIDEO_LAYER_IMPL_H_
7 7
8 #include <public/WebVideoFrameProvider.h>
9
10 #include "base/callback.h" 8 #include "base/callback.h"
11 #include "base/synchronization/lock.h" 9 #include "base/synchronization/lock.h"
12 #include "cc/cc_export.h" 10 #include "cc/cc_export.h"
13 #include "cc/layer_impl.h" 11 #include "cc/layer_impl.h"
14 #include "media/base/video_frame.h" 12 #include "media/base/video_frame.h"
13 #include "third_party/WebKit/Source/Platform/chromium/public/WebVideoFrameProvid er.h"
15 #include "third_party/khronos/GLES2/gl2.h" 14 #include "third_party/khronos/GLES2/gl2.h"
16 #include "ui/gfx/size.h" 15 #include "ui/gfx/size.h"
17 #include "ui/gfx/transform.h" 16 #include "ui/gfx/transform.h"
18 17
19 namespace WebKit { 18 namespace WebKit {
20 class WebVideoFrame; 19 class WebVideoFrame;
21 } 20 }
22 21
23 namespace media { 22 namespace media {
24 class SkCanvasVideoRenderer; 23 class SkCanvasVideoRenderer;
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 ResourceProvider::ResourceId m_externalTextureResource; 90 ResourceProvider::ResourceId m_externalTextureResource;
92 scoped_ptr<media::SkCanvasVideoRenderer> m_videoRenderer; 91 scoped_ptr<media::SkCanvasVideoRenderer> m_videoRenderer;
93 92
94 // Each index in this array corresponds to a plane in media::VideoFrame. 93 // Each index in this array corresponds to a plane in media::VideoFrame.
95 FramePlane m_framePlanes[media::VideoFrame::kMaxPlanes]; 94 FramePlane m_framePlanes[media::VideoFrame::kMaxPlanes];
96 }; 95 };
97 96
98 } // namespace cc 97 } // namespace cc
99 98
100 #endif // CC_VIDEO_LAYER_IMPL_H_ 99 #endif // CC_VIDEO_LAYER_IMPL_H_
OLDNEW
« no previous file with comments | « cc/thread_proxy.cc ('k') | webkit/compositor_bindings/compositor_bindings.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698