| 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 updateDisplayState(); | 110 updateDisplayState(); |
| 111 if (shouldDisplayPosterImage()) { | 111 if (shouldDisplayPosterImage()) { |
| 112 if (!m_imageLoader) | 112 if (!m_imageLoader) |
| 113 m_imageLoader = adoptPtr(new HTMLImageLoader(this)); | 113 m_imageLoader = adoptPtr(new HTMLImageLoader(this)); |
| 114 m_imageLoader->updateFromElementIgnoringPreviousError(); | 114 m_imageLoader->updateFromElementIgnoringPreviousError(); |
| 115 } else { | 115 } else { |
| 116 if (renderer()) | 116 if (renderer()) |
| 117 toRenderImage(renderer())->imageResource()->setImageResource(0); | 117 toRenderImage(renderer())->imageResource()->setImageResource(0); |
| 118 } | 118 } |
| 119 // Notify the player when the poster image URL changes. | 119 // Notify the player when the poster image URL changes. |
| 120 if (player()) | 120 if (webMediaPlayer()) |
| 121 player()->setPoster(posterImageURL()); | 121 webMediaPlayer()->setPoster(posterImageURL()); |
| 122 } else | 122 } else |
| 123 HTMLMediaElement::parseAttribute(name, value); | 123 HTMLMediaElement::parseAttribute(name, value); |
| 124 } | 124 } |
| 125 | 125 |
| 126 bool HTMLVideoElement::supportsFullscreen() const | 126 bool HTMLVideoElement::supportsFullscreen() const |
| 127 { | 127 { |
| 128 if (!document().page()) | 128 if (!document().page()) |
| 129 return false; | 129 return false; |
| 130 | 130 |
| 131 if (!player()) | 131 if (!player()) |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 301 { | 301 { |
| 302 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer()
->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr
c())); | 302 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer()
->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr
c())); |
| 303 } | 303 } |
| 304 | 304 |
| 305 FloatSize HTMLVideoElement::sourceSize() const | 305 FloatSize HTMLVideoElement::sourceSize() const |
| 306 { | 306 { |
| 307 return FloatSize(videoWidth(), videoHeight()); | 307 return FloatSize(videoWidth(), videoHeight()); |
| 308 } | 308 } |
| 309 | 309 |
| 310 } | 310 } |
| OLD | NEW |