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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLVideoElement.h

Issue 2442273002: cl for resolving cq issues
Patch Set: rtebase Created 3 years, 8 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 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 // The caller is responsible for allocating the destination texture. 78 // The caller is responsible for allocating the destination texture.
79 bool CopyVideoTextureToPlatformTexture(gpu::gles2::GLES2Interface*, 79 bool CopyVideoTextureToPlatformTexture(gpu::gles2::GLES2Interface*,
80 GLuint texture, 80 GLuint texture,
81 bool premultiply_alpha, 81 bool premultiply_alpha,
82 bool flip_y); 82 bool flip_y);
83 83
84 // Used by WebGL to do CPU-GPU texture upload if possible. 84 // Used by WebGL to do CPU-GPU texture upload if possible.
85 bool TexImageImpl(WebMediaPlayer::TexImageFunctionID, 85 bool TexImageImpl(WebMediaPlayer::TexImageFunctionID,
86 GLenum target, 86 GLenum target,
87 gpu::gles2::GLES2Interface*, 87 gpu::gles2::GLES2Interface*,
88 GLuint texture,
88 GLint level, 89 GLint level,
89 GLint internalformat, 90 GLint internalformat,
90 GLenum format, 91 GLenum format,
91 GLenum type, 92 GLenum type,
92 GLint xoffset, 93 GLint xoffset,
93 GLint yoffset, 94 GLint yoffset,
94 GLint zoffset, 95 GLint zoffset,
95 bool flip_y, 96 bool flip_y,
96 bool premultiply_alpha); 97 bool premultiply_alpha);
97 98
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 custom_controls_fullscreen_detector_; 161 custom_controls_fullscreen_detector_;
161 162
162 AtomicString default_poster_url_; 163 AtomicString default_poster_url_;
163 164
164 bool is_persistent_ = false; 165 bool is_persistent_ = false;
165 }; 166 };
166 167
167 } // namespace blink 168 } // namespace blink
168 169
169 #endif // HTMLVideoElement_h 170 #endif // HTMLVideoElement_h
OLDNEW
« no previous file with comments | « media/renderers/skcanvas_video_renderer_unittest.cc ('k') | third_party/WebKit/Source/core/html/HTMLVideoElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698