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

Side by Side Diff: webkit/media/webvideoframe_impl.h

Issue 11419224: Add missing (and remove superfluous) 'explicit' from constructors. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + remove non-straightforward changes Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « webkit/glue/worker_task_runner.cc ('k') | webkit/support/web_audio_device_mock.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 WEBKIT_MEDIA_WEBVIDEOFRAME_IMPL_H_ 5 #ifndef WEBKIT_MEDIA_WEBVIDEOFRAME_IMPL_H_
6 #define WEBKIT_MEDIA_WEBVIDEOFRAME_IMPL_H_ 6 #define WEBKIT_MEDIA_WEBVIDEOFRAME_IMPL_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "media/base/video_frame.h" 9 #include "media/base/video_frame.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
11 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" 11 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h" 12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
13 13
14 namespace webkit_media { 14 namespace webkit_media {
15 15
16 class WebVideoFrameImpl : public WebKit::WebVideoFrame { 16 class WebVideoFrameImpl : public WebKit::WebVideoFrame {
17 public: 17 public:
18 // This converts a WebKit::WebVideoFrame to a media::VideoFrame. 18 // This converts a WebKit::WebVideoFrame to a media::VideoFrame.
19 static media::VideoFrame* toVideoFrame( 19 static media::VideoFrame* toVideoFrame(
20 WebKit::WebVideoFrame* web_video_frame); 20 WebKit::WebVideoFrame* web_video_frame);
21 21
22 WebVideoFrameImpl(scoped_refptr<media::VideoFrame> video_frame); 22 explicit WebVideoFrameImpl(scoped_refptr<media::VideoFrame> video_frame);
23 virtual ~WebVideoFrameImpl(); 23 virtual ~WebVideoFrameImpl();
24 virtual WebVideoFrame::Format format() const; 24 virtual WebVideoFrame::Format format() const;
25 virtual unsigned planes() const; 25 virtual unsigned planes() const;
26 virtual const void* data(unsigned plane) const; 26 virtual const void* data(unsigned plane) const;
27 virtual unsigned textureId() const; 27 virtual unsigned textureId() const;
28 virtual unsigned textureTarget() const; 28 virtual unsigned textureTarget() const;
29 virtual WebKit::WebRect visibleRect() const; 29 virtual WebKit::WebRect visibleRect() const;
30 virtual WebKit::WebSize textureSize() const; 30 virtual WebKit::WebSize textureSize() const;
31 31
32 private: 32 private:
33 scoped_refptr<media::VideoFrame> video_frame_; 33 scoped_refptr<media::VideoFrame> video_frame_;
34 DISALLOW_COPY_AND_ASSIGN(WebVideoFrameImpl); 34 DISALLOW_COPY_AND_ASSIGN(WebVideoFrameImpl);
35 }; 35 };
36 36
37 // TODO(skaslev) This is temporarily inline pending the removal of 37 // TODO(skaslev) This is temporarily inline pending the removal of
38 // WebKit::WebVideoFrame and WebVideoFrameImpl which are currently unused. 38 // WebKit::WebVideoFrame and WebVideoFrameImpl which are currently unused.
39 inline media::VideoFrame* WebVideoFrameImpl::toVideoFrame( 39 inline media::VideoFrame* WebVideoFrameImpl::toVideoFrame(
40 WebKit::WebVideoFrame* web_video_frame) { 40 WebKit::WebVideoFrame* web_video_frame) {
41 WebVideoFrameImpl* wrapped_frame = 41 WebVideoFrameImpl* wrapped_frame =
42 static_cast<WebVideoFrameImpl*>(web_video_frame); 42 static_cast<WebVideoFrameImpl*>(web_video_frame);
43 if (wrapped_frame) 43 if (wrapped_frame)
44 return wrapped_frame->video_frame_.get(); 44 return wrapped_frame->video_frame_.get();
45 return NULL; 45 return NULL;
46 } 46 }
47 47
48 } // namespace webkit_media 48 } // namespace webkit_media
49 49
50 #endif // WEBKIT_MEDIA_WEBVIDEOFRAME_IMPL_H_ 50 #endif // WEBKIT_MEDIA_WEBVIDEOFRAME_IMPL_H_
OLDNEW
« no previous file with comments | « webkit/glue/worker_task_runner.cc ('k') | webkit/support/web_audio_device_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698