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 3750 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3761 | 3761 |
3762 return false; | 3762 return false; |
3763 } | 3763 } |
3764 | 3764 |
3765 bool HTMLMediaElement::createMediaControls() | 3765 bool HTMLMediaElement::createMediaControls() |
3766 { | 3766 { |
3767 if (hasMediaControls()) | 3767 if (hasMediaControls()) |
3768 return true; | 3768 return true; |
3769 | 3769 |
3770 RefPtrWillBeRawPtr<MediaControls> mediaControls = MediaControls::create(*thi s); | 3770 RefPtrWillBeRawPtr<MediaControls> mediaControls = MediaControls::create(*thi s); |
3771 if (!mediaControls) | |
3772 return false; | |
philipj_slow
2015/01/14 19:19:08
HTMLMediaElement::createMediaControls() now always
fs
2015/01/15 09:15:31
I had a follow up to do that, I guess I can includ
philipj_slow
2015/01/15 09:43:01
Separately is fine.
| |
3773 | 3771 |
3774 mediaControls->reset(); | 3772 mediaControls->reset(); |
3775 if (isFullscreen()) | 3773 if (isFullscreen()) |
3776 mediaControls->enteredFullscreen(); | 3774 mediaControls->enteredFullscreen(); |
3777 | 3775 |
3778 ensureUserAgentShadowRoot().appendChild(mediaControls); | 3776 ensureUserAgentShadowRoot().appendChild(mediaControls); |
3779 | 3777 |
3780 if (!shouldShowControls() || !inDocument()) | 3778 if (!shouldShowControls() || !inDocument()) |
3781 mediaControls->hide(); | 3779 mediaControls->hide(); |
3782 | 3780 |
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4115 | 4113 |
4116 #if ENABLE(WEB_AUDIO) | 4114 #if ENABLE(WEB_AUDIO) |
4117 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) | 4115 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) |
4118 { | 4116 { |
4119 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) | 4117 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) |
4120 audioSourceProvider()->setClient(nullptr); | 4118 audioSourceProvider()->setClient(nullptr); |
4121 } | 4119 } |
4122 #endif | 4120 #endif |
4123 | 4121 |
4124 } | 4122 } |
OLD | NEW |