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 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
175 { | 175 { |
176 DisplayMode oldMode = displayMode(); | 176 DisplayMode oldMode = displayMode(); |
177 KURL poster = posterImageURL(); | 177 KURL poster = posterImageURL(); |
178 | 178 |
179 if (!poster.isEmpty()) { | 179 if (!poster.isEmpty()) { |
180 // We have a poster path, but only show it until the user triggers displ ay by playing or seeking and the | 180 // We have a poster path, but only show it until the user triggers displ ay by playing or seeking and the |
181 // media engine has something to display. | 181 // media engine has something to display. |
182 // Don't show the poster if there is a seek operation or | 182 // Don't show the poster if there is a seek operation or |
183 // the video has restarted because of loop attribute | 183 // the video has restarted because of loop attribute |
184 if (mode == Video && oldMode == Poster && !hasAvailableVideoFrame()) | 184 if (mode == Video && oldMode == Poster && !hasAvailableVideoFrame()) |
185 mode = PosterWaitingForVideo; | 185 mode = Poster; |
philipj_slow
2014/09/01 11:09:17
Since oldMode is Poster, can't we just return inst
Srirama
2014/09/01 13:27:55
Acknowledged.
| |
186 } | 186 } |
187 | 187 |
188 HTMLMediaElement::setDisplayMode(mode); | 188 HTMLMediaElement::setDisplayMode(mode); |
189 | 189 |
190 if (renderer() && displayMode() != oldMode) | 190 if (renderer() && displayMode() != oldMode) |
191 renderer()->updateFromElement(); | 191 renderer()->updateFromElement(); |
192 } | 192 } |
193 | 193 |
194 void HTMLVideoElement::updateDisplayState() | 194 void HTMLVideoElement::updateDisplayState() |
195 { | 195 { |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
316 { | 316 { |
317 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer() ->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr c())); | 317 return !hasSingleSecurityOrigin() || (!(webMediaPlayer() && webMediaPlayer() ->didPassCORSAccessCheck()) && destinationSecurityOrigin->taintsCanvas(currentSr c())); |
318 } | 318 } |
319 | 319 |
320 FloatSize HTMLVideoElement::sourceSize() const | 320 FloatSize HTMLVideoElement::sourceSize() const |
321 { | 321 { |
322 return FloatSize(videoWidth(), videoHeight()); | 322 return FloatSize(videoWidth(), videoHeight()); |
323 } | 323 } |
324 | 324 |
325 } | 325 } |
OLD | NEW |