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

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

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 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 return false; 316 return false;
317 317
318 return GetWebMediaPlayer()->CopyVideoTextureToPlatformTexture( 318 return GetWebMediaPlayer()->CopyVideoTextureToPlatformTexture(
319 gl, texture, premultiply_alpha, flip_y); 319 gl, texture, premultiply_alpha, flip_y);
320 } 320 }
321 321
322 bool HTMLVideoElement::TexImageImpl( 322 bool HTMLVideoElement::TexImageImpl(
323 WebMediaPlayer::TexImageFunctionID function_id, 323 WebMediaPlayer::TexImageFunctionID function_id,
324 GLenum target, 324 GLenum target,
325 gpu::gles2::GLES2Interface* gl, 325 gpu::gles2::GLES2Interface* gl,
326 GLuint texture,
326 GLint level, 327 GLint level,
327 GLint internalformat, 328 GLint internalformat,
328 GLenum format, 329 GLenum format,
329 GLenum type, 330 GLenum type,
330 GLint xoffset, 331 GLint xoffset,
331 GLint yoffset, 332 GLint yoffset,
332 GLint zoffset, 333 GLint zoffset,
333 bool flip_y, 334 bool flip_y,
334 bool premultiply_alpha) { 335 bool premultiply_alpha) {
335 if (!GetWebMediaPlayer()) 336 if (!GetWebMediaPlayer())
336 return false; 337 return false;
337 return GetWebMediaPlayer()->TexImageImpl( 338 return GetWebMediaPlayer()->TexImageImpl(
338 function_id, target, gl, level, internalformat, format, type, xoffset, 339 function_id, target, gl, texture, level, internalformat, format, type,
339 yoffset, zoffset, flip_y, premultiply_alpha); 340 xoffset, yoffset, zoffset, flip_y, premultiply_alpha);
340 } 341 }
341 342
342 bool HTMLVideoElement::HasAvailableVideoFrame() const { 343 bool HTMLVideoElement::HasAvailableVideoFrame() const {
343 if (!GetWebMediaPlayer()) 344 if (!GetWebMediaPlayer())
344 return false; 345 return false;
345 346
346 return GetWebMediaPlayer()->HasVideo() && 347 return GetWebMediaPlayer()->HasVideo() &&
347 GetWebMediaPlayer()->GetReadyState() >= 348 GetWebMediaPlayer()->GetReadyState() >=
348 WebMediaPlayer::kReadyStateHaveCurrentData; 349 WebMediaPlayer::kReadyStateHaveCurrentData;
349 } 350 }
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 return ScriptPromise(); 475 return ScriptPromise();
475 if (!ImageBitmap::IsResizeOptionValid(options, exception_state)) 476 if (!ImageBitmap::IsResizeOptionValid(options, exception_state))
476 return ScriptPromise(); 477 return ScriptPromise();
477 return ImageBitmapSource::FulfillImageBitmap( 478 return ImageBitmapSource::FulfillImageBitmap(
478 script_state, ImageBitmap::Create( 479 script_state, ImageBitmap::Create(
479 this, crop_rect, 480 this, crop_rect,
480 event_target.ToLocalDOMWindow()->document(), options)); 481 event_target.ToLocalDOMWindow()->document(), options));
481 } 482 }
482 483
483 } // namespace blink 484 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698