| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 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 5287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5298 } | 5298 } |
| 5299 } | 5299 } |
| 5300 | 5300 |
| 5301 if (source_image_rect_is_default) { | 5301 if (source_image_rect_is_default) { |
| 5302 // Try using optimized CPU-GPU path for some formats: e.g. Y16 and Y8. It | 5302 // Try using optimized CPU-GPU path for some formats: e.g. Y16 and Y8. It |
| 5303 // leaves early for other formats or if frame is stored on GPU. | 5303 // leaves early for other formats or if frame is stored on GPU. |
| 5304 ScopedUnpackParametersResetRestore( | 5304 ScopedUnpackParametersResetRestore( |
| 5305 this, unpack_flip_y_ || unpack_premultiply_alpha_); | 5305 this, unpack_flip_y_ || unpack_premultiply_alpha_); |
| 5306 if (video->TexImageImpl( | 5306 if (video->TexImageImpl( |
| 5307 static_cast<WebMediaPlayer::TexImageFunctionID>(function_id), | 5307 static_cast<WebMediaPlayer::TexImageFunctionID>(function_id), |
| 5308 target, ContextGL(), level, | 5308 target, ContextGL(), texture->Object(), level, |
| 5309 ConvertTexInternalFormat(internalformat, type), format, type, | 5309 ConvertTexInternalFormat(internalformat, type), format, type, |
| 5310 xoffset, yoffset, zoffset, unpack_flip_y_, | 5310 xoffset, yoffset, zoffset, unpack_flip_y_, |
| 5311 unpack_premultiply_alpha_ && | 5311 unpack_premultiply_alpha_ && |
| 5312 unpack_colorspace_conversion_ == GL_NONE)) { | 5312 unpack_colorspace_conversion_ == GL_NONE)) { |
| 5313 texture->UpdateLastUploadedVideo(video->GetWebMediaPlayer()); | 5313 texture->UpdateLastUploadedVideo(video->GetWebMediaPlayer()); |
| 5314 return; | 5314 return; |
| 5315 } | 5315 } |
| 5316 } | 5316 } |
| 5317 | 5317 |
| 5318 if (use_copyTextureCHROMIUM) { | 5318 if (use_copyTextureCHROMIUM) { |
| (...skipping 2557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 7876 | 7876 |
| 7877 void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas( | 7877 void WebGLRenderingContextBase::getHTMLOrOffscreenCanvas( |
| 7878 HTMLCanvasElementOrOffscreenCanvas& result) const { | 7878 HTMLCanvasElementOrOffscreenCanvas& result) const { |
| 7879 if (canvas()) | 7879 if (canvas()) |
| 7880 result.setHTMLCanvasElement(canvas()); | 7880 result.setHTMLCanvasElement(canvas()); |
| 7881 else | 7881 else |
| 7882 result.setOffscreenCanvas(offscreenCanvas()); | 7882 result.setOffscreenCanvas(offscreenCanvas()); |
| 7883 } | 7883 } |
| 7884 | 7884 |
| 7885 } // namespace blink | 7885 } // namespace blink |
| OLD | NEW |