| 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 updateDisplayState(); | 116 updateDisplayState(); |
| 117 if (shouldDisplayPosterImage()) { | 117 if (shouldDisplayPosterImage()) { |
| 118 if (!m_imageLoader) | 118 if (!m_imageLoader) |
| 119 m_imageLoader = HTMLImageLoader::create(this); | 119 m_imageLoader = HTMLImageLoader::create(this); |
| 120 m_imageLoader->updateFromElement(ImageLoader::UpdateIgnorePreviousEr
ror); | 120 m_imageLoader->updateFromElement(ImageLoader::UpdateIgnorePreviousEr
ror); |
| 121 } else { | 121 } else { |
| 122 if (renderer()) | 122 if (renderer()) |
| 123 toRenderImage(renderer())->imageResource()->setImageResource(0); | 123 toRenderImage(renderer())->imageResource()->setImageResource(0); |
| 124 } | 124 } |
| 125 // Notify the player when the poster image URL changes. | 125 // Notify the player when the poster image URL changes. |
| 126 if (player()) | 126 if (webMediaPlayer()) |
| 127 player()->setPoster(posterImageURL()); | 127 webMediaPlayer()->setPoster(posterImageURL()); |
| 128 } else | 128 } else |
| 129 HTMLMediaElement::parseAttribute(name, value); | 129 HTMLMediaElement::parseAttribute(name, value); |
| 130 } | 130 } |
| 131 | 131 |
| 132 bool HTMLVideoElement::supportsFullscreen() const | 132 bool HTMLVideoElement::supportsFullscreen() const |
| 133 { | 133 { |
| 134 if (!document().page()) | 134 if (!document().page()) |
| 135 return false; | 135 return false; |
| 136 | 136 |
| 137 if (!player()) | 137 if (!player()) |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 { | 307 { |
| 308 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer()
->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr
c())); | 308 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer()
->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr
c())); |
| 309 } | 309 } |
| 310 | 310 |
| 311 FloatSize HTMLVideoElement::sourceSize() const | 311 FloatSize HTMLVideoElement::sourceSize() const |
| 312 { | 312 { |
| 313 return FloatSize(videoWidth(), videoHeight()); | 313 return FloatSize(videoWidth(), videoHeight()); |
| 314 } | 314 } |
| 315 | 315 |
| 316 } | 316 } |
| OLD | NEW |