OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 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 1077 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1088 attemptLoad = false; | 1088 attemptLoad = false; |
1089 } | 1089 } |
1090 } | 1090 } |
1091 } | 1091 } |
1092 } | 1092 } |
1093 | 1093 |
1094 bool canLoadResource = source.isMediaProviderObject() || canLoadURL(url, con tentType); | 1094 bool canLoadResource = source.isMediaProviderObject() || canLoadURL(url, con tentType); |
1095 if (attemptLoad && canLoadResource) { | 1095 if (attemptLoad && canLoadResource) { |
1096 ASSERT(!webMediaPlayer()); | 1096 ASSERT(!webMediaPlayer()); |
1097 | 1097 |
1098 if (effectivePreloadType() == WebMediaPlayer::PreloadNone) { | 1098 if (!m_mediaSource && effectivePreloadType() == WebMediaPlayer::PreloadN one) { |
philipj_slow
2016/04/14 12:39:27
I would like it very much if this matched the beha
wolenetz
2016/04/21 21:37:30
I've added isObjectOrBlobURL usage here, but addin
| |
1099 WTF_LOG(Media, "HTMLMediaElement::loadResource(%p) : Delaying load b ecause preload == 'none'", this); | 1099 WTF_LOG(Media, "HTMLMediaElement::loadResource(%p) : Delaying load b ecause preload == 'none'", this); |
1100 deferLoad(); | 1100 deferLoad(); |
1101 } else { | 1101 } else { |
1102 startPlayerLoad(); | 1102 startPlayerLoad(); |
1103 } | 1103 } |
1104 } else { | 1104 } else { |
1105 mediaLoadingFailed(WebMediaPlayer::NetworkStateFormatError); | 1105 mediaLoadingFailed(WebMediaPlayer::NetworkStateFormatError); |
1106 } | 1106 } |
1107 | 1107 |
1108 // If there is no poster to display, allow the media engine to render video frames as soon as | 1108 // If there is no poster to display, allow the media engine to render video frames as soon as |
(...skipping 2831 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3940 } | 3940 } |
3941 | 3941 |
3942 #if !ENABLE(OILPAN) | 3942 #if !ENABLE(OILPAN) |
3943 WeakPtr<HTMLMediaElement> HTMLMediaElement::createWeakPtr() | 3943 WeakPtr<HTMLMediaElement> HTMLMediaElement::createWeakPtr() |
3944 { | 3944 { |
3945 return m_weakPtrFactory.createWeakPtr(); | 3945 return m_weakPtrFactory.createWeakPtr(); |
3946 } | 3946 } |
3947 #endif | 3947 #endif |
3948 | 3948 |
3949 } // namespace blink | 3949 } // namespace blink |
OLD | NEW |