| 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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 { | 176 { |
| 177 DisplayMode oldMode = displayMode(); | 177 DisplayMode oldMode = displayMode(); |
| 178 KURL poster = posterImageURL(); | 178 KURL poster = posterImageURL(); |
| 179 | 179 |
| 180 if (!poster.isEmpty()) { | 180 if (!poster.isEmpty()) { |
| 181 // We have a poster path, but only show it until the user triggers displ
ay by playing or seeking and the | 181 // We have a poster path, but only show it until the user triggers displ
ay by playing or seeking and the |
| 182 // media engine has something to display. | 182 // media engine has something to display. |
| 183 // Don't show the poster if there is a seek operation or | 183 // Don't show the poster if there is a seek operation or |
| 184 // the video has restarted because of loop attribute | 184 // the video has restarted because of loop attribute |
| 185 if (mode == Video && oldMode == Poster && !hasAvailableVideoFrame()) | 185 if (mode == Video && oldMode == Poster && !hasAvailableVideoFrame()) |
| 186 mode = PosterWaitingForVideo; | 186 return; |
| 187 } | 187 } |
| 188 | 188 |
| 189 HTMLMediaElement::setDisplayMode(mode); | 189 HTMLMediaElement::setDisplayMode(mode); |
| 190 | 190 |
| 191 if (renderer() && displayMode() != oldMode) | 191 if (renderer() && displayMode() != oldMode) |
| 192 renderer()->updateFromElement(); | 192 renderer()->updateFromElement(); |
| 193 } | 193 } |
| 194 | 194 |
| 195 void HTMLVideoElement::updateDisplayState() | 195 void HTMLVideoElement::updateDisplayState() |
| 196 { | 196 { |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 } |
| OLD | NEW |