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

Side by Side Diff: webkit/glue/webvideoframe_impl.cc

Issue 3433005: Linux: More gcc 4.5 NULL versus 0 fixes. (Closed)
Patch Set: Created 10 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
« no previous file with comments | « webkit/glue/plugins/pepper_transport.cc ('k') | no next file » | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "webkit/glue/webvideoframe_impl.h" 5 #include "webkit/glue/webvideoframe_impl.h"
6 6
7 #include "media/base/video_frame.h" 7 #include "media/base/video_frame.h"
8 #include "third_party/WebKit/WebKit/chromium/public/WebVideoFrame.h" 8 #include "third_party/WebKit/WebKit/chromium/public/WebVideoFrame.h"
9 9
10 using namespace WebKit; 10 using namespace WebKit;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 WebVideoFrame::Format WebVideoFrameImpl::format() const { 54 WebVideoFrame::Format WebVideoFrameImpl::format() const {
55 if (video_frame_.get()) 55 if (video_frame_.get())
56 return static_cast<WebVideoFrame::Format>(video_frame_->format()); 56 return static_cast<WebVideoFrame::Format>(video_frame_->format());
57 return WebVideoFrame::FormatInvalid; 57 return WebVideoFrame::FormatInvalid;
58 } 58 }
59 59
60 unsigned WebVideoFrameImpl::width() const { 60 unsigned WebVideoFrameImpl::width() const {
61 if (video_frame_.get()) 61 if (video_frame_.get())
62 return video_frame_->width(); 62 return video_frame_->width();
63 return NULL; 63 return 0;
64 } 64 }
65 65
66 unsigned WebVideoFrameImpl::height() const { 66 unsigned WebVideoFrameImpl::height() const {
67 if (video_frame_.get()) 67 if (video_frame_.get())
68 return video_frame_->height(); 68 return video_frame_->height();
69 return NULL; 69 return 0;
70 } 70 }
71 71
72 unsigned WebVideoFrameImpl::planes() const { 72 unsigned WebVideoFrameImpl::planes() const {
73 if (video_frame_.get()) 73 if (video_frame_.get())
74 return video_frame_->planes(); 74 return video_frame_->planes();
75 return NULL; 75 return 0;
76 } 76 }
77 77
78 int WebVideoFrameImpl::stride(unsigned plane) const { 78 int WebVideoFrameImpl::stride(unsigned plane) const {
79 if (video_frame_.get()) 79 if (video_frame_.get())
80 return static_cast<int>(video_frame_->stride(plane)); 80 return static_cast<int>(video_frame_->stride(plane));
81 return NULL; 81 return 0;
82 } 82 }
83 83
84 const void* WebVideoFrameImpl::data(unsigned plane) const { 84 const void* WebVideoFrameImpl::data(unsigned plane) const {
85 if (video_frame_.get()) 85 if (video_frame_.get())
86 return static_cast<const void*>(video_frame_->data(plane)); 86 return static_cast<const void*>(video_frame_->data(plane));
87 return NULL; 87 return NULL;
88 } 88 }
89 89
90 } // namespace webkit_glue 90 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/plugins/pepper_transport.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698