| OLD | NEW |
| 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 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 else if (displayMode() < Poster) | 198 else if (displayMode() < Poster) |
| 199 setDisplayMode(Poster); | 199 setDisplayMode(Poster); |
| 200 } | 200 } |
| 201 | 201 |
| 202 void HTMLVideoElement::paintCurrentFrameInContext(GraphicsContext* context, cons
t IntRect& destRect) const | 202 void HTMLVideoElement::paintCurrentFrameInContext(GraphicsContext* context, cons
t IntRect& destRect) const |
| 203 { | 203 { |
| 204 if (!webMediaPlayer()) | 204 if (!webMediaPlayer()) |
| 205 return; | 205 return; |
| 206 | 206 |
| 207 WebCanvas* canvas = context->canvas(); | 207 WebCanvas* canvas = context->canvas(); |
| 208 webMediaPlayer()->paint(canvas, destRect, context->getNormalizedAlpha()); | 208 SkXfermode::Mode mode = WebCoreCompositeToSkiaComposite(context->compositeOp
eration(), context->blendModeOperation()); |
| 209 webMediaPlayer()->paint(canvas, destRect, context->getNormalizedAlpha(), mod
e); |
| 209 } | 210 } |
| 210 | 211 |
| 211 bool HTMLVideoElement::copyVideoTextureToPlatformTexture(WebGraphicsContext3D* c
ontext, Platform3DObject texture, GLint level, GLenum internalFormat, GLenum typ
e, bool premultiplyAlpha, bool flipY) | 212 bool HTMLVideoElement::copyVideoTextureToPlatformTexture(WebGraphicsContext3D* c
ontext, Platform3DObject texture, GLint level, GLenum internalFormat, GLenum typ
e, bool premultiplyAlpha, bool flipY) |
| 212 { | 213 { |
| 213 if (!webMediaPlayer()) | 214 if (!webMediaPlayer()) |
| 214 return false; | 215 return false; |
| 215 | 216 |
| 216 if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(internalFormat, type, level
)) | 217 if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(internalFormat, type, level
)) |
| 217 return false; | 218 return false; |
| 218 | 219 |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 { | 317 { |
| 317 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer()
->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr
c())); | 318 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer()
->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr
c())); |
| 318 } | 319 } |
| 319 | 320 |
| 320 FloatSize HTMLVideoElement::sourceSize() const | 321 FloatSize HTMLVideoElement::sourceSize() const |
| 321 { | 322 { |
| 322 return FloatSize(videoWidth(), videoHeight()); | 323 return FloatSize(videoWidth(), videoHeight()); |
| 323 } | 324 } |
| 324 | 325 |
| 325 } | 326 } |
| OLD | NEW |