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

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

Issue 2791813003: Fix broken draw/upload paths from videos to 2D canvas and WebGL. (Closed)
Patch Set: Disable GPU-GPU copies to floating-point textures on Android. 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 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 media_flags.setAlpha(0xFF); 303 media_flags.setAlpha(0xFF);
304 media_flags.setFilterQuality(kLow_SkFilterQuality); 304 media_flags.setFilterQuality(kLow_SkFilterQuality);
305 } 305 }
306 306
307 GetWebMediaPlayer()->Paint(canvas, dest_rect, media_flags); 307 GetWebMediaPlayer()->Paint(canvas, dest_rect, media_flags);
308 } 308 }
309 309
310 bool HTMLVideoElement::CopyVideoTextureToPlatformTexture( 310 bool HTMLVideoElement::CopyVideoTextureToPlatformTexture(
311 gpu::gles2::GLES2Interface* gl, 311 gpu::gles2::GLES2Interface* gl,
312 GLuint texture, 312 GLuint texture,
313 GLenum internal_format,
314 GLenum format,
315 GLenum type,
313 bool premultiply_alpha, 316 bool premultiply_alpha,
314 bool flip_y) { 317 bool flip_y) {
315 if (!GetWebMediaPlayer()) 318 if (!GetWebMediaPlayer())
316 return false; 319 return false;
317 320
318 return GetWebMediaPlayer()->CopyVideoTextureToPlatformTexture( 321 return GetWebMediaPlayer()->CopyVideoTextureToPlatformTexture(
319 gl, texture, premultiply_alpha, flip_y); 322 gl, texture, internal_format, format, type, premultiply_alpha, flip_y);
320 } 323 }
321 324
322 bool HTMLVideoElement::TexImageImpl( 325 bool HTMLVideoElement::TexImageImpl(
323 WebMediaPlayer::TexImageFunctionID function_id, 326 WebMediaPlayer::TexImageFunctionID function_id,
324 GLenum target, 327 GLenum target,
325 gpu::gles2::GLES2Interface* gl, 328 gpu::gles2::GLES2Interface* gl,
326 GLint level, 329 GLint level,
327 GLint internalformat, 330 GLint internalformat,
328 GLenum format, 331 GLenum format,
329 GLenum type, 332 GLenum type,
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 return ScriptPromise(); 477 return ScriptPromise();
475 if (!ImageBitmap::IsResizeOptionValid(options, exception_state)) 478 if (!ImageBitmap::IsResizeOptionValid(options, exception_state))
476 return ScriptPromise(); 479 return ScriptPromise();
477 return ImageBitmapSource::FulfillImageBitmap( 480 return ImageBitmapSource::FulfillImageBitmap(
478 script_state, ImageBitmap::Create( 481 script_state, ImageBitmap::Create(
479 this, crop_rect, 482 this, crop_rect,
480 event_target.ToLocalDOMWindow()->document(), options)); 483 event_target.ToLocalDOMWindow()->document(), options));
481 } 484 }
482 485
483 } // namespace blink 486 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698