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

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

Issue 840733004: Replace setCompositeOperation(CompositeOperator, WebBlendMode) with setCompositeOperation(SkXfermod… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rename compositeOperationDeprecated Created 5 years, 11 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/CanvasRenderingContext2D.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 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 else if (displayMode() < Poster) 199 else if (displayMode() < Poster)
200 setDisplayMode(Poster); 200 setDisplayMode(Poster);
201 } 201 }
202 202
203 void HTMLVideoElement::paintCurrentFrameInContext(GraphicsContext* context, cons t IntRect& destRect) const 203 void HTMLVideoElement::paintCurrentFrameInContext(GraphicsContext* context, cons t IntRect& destRect) const
204 { 204 {
205 if (!webMediaPlayer()) 205 if (!webMediaPlayer())
206 return; 206 return;
207 207
208 WebCanvas* canvas = context->canvas(); 208 WebCanvas* canvas = context->canvas();
209 SkXfermode::Mode mode = WebCoreCompositeToSkiaComposite(context->compositeOp eration(), context->blendModeOperation()); 209 SkXfermode::Mode mode = context->compositeOperation();
210 webMediaPlayer()->paint(canvas, destRect, context->getNormalizedAlpha(), mod e); 210 webMediaPlayer()->paint(canvas, destRect, context->getNormalizedAlpha(), mod e);
211 } 211 }
212 212
213 bool HTMLVideoElement::copyVideoTextureToPlatformTexture(WebGraphicsContext3D* c ontext, Platform3DObject texture, GLint level, GLenum internalFormat, GLenum typ e, bool premultiplyAlpha, bool flipY) 213 bool HTMLVideoElement::copyVideoTextureToPlatformTexture(WebGraphicsContext3D* c ontext, Platform3DObject texture, GLint level, GLenum internalFormat, GLenum typ e, bool premultiplyAlpha, bool flipY)
214 { 214 {
215 if (!webMediaPlayer()) 215 if (!webMediaPlayer())
216 return false; 216 return false;
217 217
218 if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(internalFormat, type, level )) 218 if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(internalFormat, type, level ))
219 return false; 219 return false;
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 { 318 {
319 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer() ->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr c())); 319 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer() ->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr c()));
320 } 320 }
321 321
322 FloatSize HTMLVideoElement::sourceSize() const 322 FloatSize HTMLVideoElement::sourceSize() const
323 { 323 {
324 return FloatSize(videoWidth(), videoHeight()); 324 return FloatSize(videoWidth(), videoHeight());
325 } 325 }
326 326
327 } 327 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/canvas/CanvasRenderingContext2D.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698