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

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

Issue 481433002: gpu: Remove WebGraphicsContext3D::makeContextCurrent() in Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase to ToT Created 6 years, 3 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
« no previous file with comments | « no previous file | Source/core/html/canvas/WebGLRenderingContextBase.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 206
207 WebCanvas* canvas = context->canvas(); 207 WebCanvas* canvas = context->canvas();
208 webMediaPlayer()->paint(canvas, destRect, context->getNormalizedAlpha()); 208 webMediaPlayer()->paint(canvas, destRect, context->getNormalizedAlpha());
209 } 209 }
210 210
211 bool HTMLVideoElement::copyVideoTextureToPlatformTexture(WebGraphicsContext3D* c ontext, Platform3DObject texture, GLint level, GLenum internalFormat, GLenum typ e, bool premultiplyAlpha, bool flipY) 211 bool HTMLVideoElement::copyVideoTextureToPlatformTexture(WebGraphicsContext3D* c ontext, Platform3DObject texture, GLint level, GLenum internalFormat, GLenum typ e, bool premultiplyAlpha, bool flipY)
212 { 212 {
213 if (!webMediaPlayer()) 213 if (!webMediaPlayer())
214 return false; 214 return false;
215 215
216 if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(internalFormat, type, level ) || !context->makeContextCurrent()) 216 if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(internalFormat, type, level ))
217 return false; 217 return false;
218 218
219 return webMediaPlayer()->copyVideoTextureToPlatformTexture(context, texture, level, internalFormat, type, premultiplyAlpha, flipY); 219 return webMediaPlayer()->copyVideoTextureToPlatformTexture(context, texture, level, internalFormat, type, premultiplyAlpha, flipY);
220 } 220 }
221 221
222 bool HTMLVideoElement::hasAvailableVideoFrame() const 222 bool HTMLVideoElement::hasAvailableVideoFrame() const
223 { 223 {
224 if (!webMediaPlayer()) 224 if (!webMediaPlayer())
225 return false; 225 return false;
226 226
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 { 316 {
317 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer() ->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr c())); 317 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer() ->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr c()));
318 } 318 }
319 319
320 FloatSize HTMLVideoElement::sourceSize() const 320 FloatSize HTMLVideoElement::sourceSize() const
321 { 321 {
322 return FloatSize(videoWidth(), videoHeight()); 322 return FloatSize(videoWidth(), videoHeight());
323 } 323 }
324 324
325 } 325 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/canvas/WebGLRenderingContextBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698