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

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

Issue 2854263006: Remove non-target version of copyVideoTextureToPlatformTexture (Closed)
Patch Set: Created 3 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
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 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 } else { 310 } else {
311 media_flags.setAlpha(0xFF); 311 media_flags.setAlpha(0xFF);
312 media_flags.setFilterQuality(kLow_SkFilterQuality); 312 media_flags.setFilterQuality(kLow_SkFilterQuality);
313 } 313 }
314 314
315 GetWebMediaPlayer()->Paint(canvas, dest_rect, media_flags); 315 GetWebMediaPlayer()->Paint(canvas, dest_rect, media_flags);
316 } 316 }
317 317
318 bool HTMLVideoElement::CopyVideoTextureToPlatformTexture( 318 bool HTMLVideoElement::CopyVideoTextureToPlatformTexture(
319 gpu::gles2::GLES2Interface* gl, 319 gpu::gles2::GLES2Interface* gl,
320 GLenum target,
320 GLuint texture, 321 GLuint texture,
321 GLenum internal_format, 322 GLenum internal_format,
322 GLenum format, 323 GLenum format,
323 GLenum type, 324 GLenum type,
325 GLint level,
324 bool premultiply_alpha, 326 bool premultiply_alpha,
325 bool flip_y) { 327 bool flip_y) {
326 if (!GetWebMediaPlayer()) 328 if (!GetWebMediaPlayer())
327 return false; 329 return false;
328 330
329 return GetWebMediaPlayer()->CopyVideoTextureToPlatformTexture( 331 return GetWebMediaPlayer()->CopyVideoTextureToPlatformTexture(
330 gl, texture, internal_format, format, type, premultiply_alpha, flip_y); 332 gl, target, texture, internal_format, format, type, level,
333 premultiply_alpha, flip_y);
331 } 334 }
332 335
333 bool HTMLVideoElement::TexImageImpl( 336 bool HTMLVideoElement::TexImageImpl(
334 WebMediaPlayer::TexImageFunctionID function_id, 337 WebMediaPlayer::TexImageFunctionID function_id,
335 GLenum target, 338 GLenum target,
336 gpu::gles2::GLES2Interface* gl, 339 gpu::gles2::GLES2Interface* gl,
337 GLuint texture, 340 GLuint texture,
338 GLint level, 341 GLint level,
339 GLint internalformat, 342 GLint internalformat,
340 GLenum format, 343 GLenum format,
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 } 519 }
517 520
518 void HTMLVideoElement::DisableMediaRemoting() { 521 void HTMLVideoElement::DisableMediaRemoting() {
519 if (GetWebMediaPlayer()) 522 if (GetWebMediaPlayer())
520 GetWebMediaPlayer()->RequestRemotePlaybackDisabled(true); 523 GetWebMediaPlayer()->RequestRemotePlaybackDisabled(true);
521 media_remoting_status_ = MediaRemotingStatus::kDisabled; 524 media_remoting_status_ = MediaRemotingStatus::kDisabled;
522 MediaRemotingStopped(); 525 MediaRemotingStopped();
523 } 526 }
524 527
525 } // namespace blink 528 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698