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 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 } | 309 } |
310 | 310 |
311 paintCurrentFrameInContext(imageBuffer->context(), IntRect(IntPoint(0, 0), i
ntrinsicSize)); | 311 paintCurrentFrameInContext(imageBuffer->context(), IntRect(IntPoint(0, 0), i
ntrinsicSize)); |
312 | 312 |
313 *status = NormalSourceImageStatus; | 313 *status = NormalSourceImageStatus; |
314 return imageBuffer->copyImage(mode == CopySourceImageIfVolatile ? CopyBackin
gStore : DontCopyBackingStore, Unscaled); | 314 return imageBuffer->copyImage(mode == CopySourceImageIfVolatile ? CopyBackin
gStore : DontCopyBackingStore, Unscaled); |
315 } | 315 } |
316 | 316 |
317 bool HTMLVideoElement::wouldTaintOrigin(SecurityOrigin* destinationSecurityOrigi
n) const | 317 bool HTMLVideoElement::wouldTaintOrigin(SecurityOrigin* destinationSecurityOrigi
n) const |
318 { | 318 { |
319 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer()
->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr
c())); | 319 return !isMediaDataCORSSameOrigin(destinationSecurityOrigin); |
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 } |
OLD | NEW |