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

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

Issue 7013047: 'using namespace' fix in webkit/glue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: '' Created 9 years, 7 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/regular_expression_unittest.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/Source/WebKit/chromium/public/WebVideoFrame.h" 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
9 9
10 using namespace WebKit; 10 using WebKit::WebVideoFrame;
11 11
12 namespace webkit_glue { 12 namespace webkit_glue {
13 13
14 media::VideoFrame* WebVideoFrameImpl::toVideoFrame( 14 media::VideoFrame* WebVideoFrameImpl::toVideoFrame(
15 WebVideoFrame* web_video_frame) { 15 WebVideoFrame* web_video_frame) {
16 WebVideoFrameImpl* wrapped_frame = 16 WebVideoFrameImpl* wrapped_frame =
17 static_cast<WebVideoFrameImpl*>(web_video_frame); 17 static_cast<WebVideoFrameImpl*>(web_video_frame);
18 if (wrapped_frame) 18 if (wrapped_frame)
19 return wrapped_frame->video_frame_.get(); 19 return wrapped_frame->video_frame_.get();
20 return NULL; 20 return NULL;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 return NULL; 89 return NULL;
90 } 90 }
91 91
92 unsigned WebVideoFrameImpl::texture(unsigned plane) const { 92 unsigned WebVideoFrameImpl::texture(unsigned plane) const {
93 if (video_frame_.get()) 93 if (video_frame_.get())
94 return video_frame_->gl_texture(plane); 94 return video_frame_->gl_texture(plane);
95 return 0; 95 return 0;
96 } 96 }
97 97
98 } // namespace webkit_glue 98 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/regular_expression_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698