| 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 if (!m_imageLoader) | 121 if (!m_imageLoader) |
| 122 m_imageLoader = HTMLImageLoader::create(this); | 122 m_imageLoader = HTMLImageLoader::create(this); |
| 123 m_imageLoader->updateFromElement(ImageLoader::UpdateIgnorePreviousEr
ror); | 123 m_imageLoader->updateFromElement(ImageLoader::UpdateIgnorePreviousEr
ror); |
| 124 } else { | 124 } else { |
| 125 if (renderer()) | 125 if (renderer()) |
| 126 toRenderImage(renderer())->imageResource()->setImageResource(0); | 126 toRenderImage(renderer())->imageResource()->setImageResource(0); |
| 127 } | 127 } |
| 128 // Notify the player when the poster image URL changes. | 128 // Notify the player when the poster image URL changes. |
| 129 if (webMediaPlayer()) | 129 if (webMediaPlayer()) |
| 130 webMediaPlayer()->setPoster(posterImageURL()); | 130 webMediaPlayer()->setPoster(posterImageURL()); |
| 131 } else | 131 } else { |
| 132 HTMLMediaElement::parseAttribute(name, value); | 132 HTMLMediaElement::parseAttribute(name, value); |
| 133 } |
| 133 } | 134 } |
| 134 | 135 |
| 135 bool HTMLVideoElement::supportsFullscreen() const | 136 bool HTMLVideoElement::supportsFullscreen() const |
| 136 { | 137 { |
| 137 if (!document().page()) | 138 if (!document().page()) |
| 138 return false; | 139 return false; |
| 139 | 140 |
| 140 if (!webMediaPlayer()) | 141 if (!webMediaPlayer()) |
| 141 return false; | 142 return false; |
| 142 | 143 |
| (...skipping 173 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 |