| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserv
ed. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserv
ed. |
| 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 3692 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3703 | 3703 |
| 3704 // Reset m_readyState since m_player is gone. | 3704 // Reset m_readyState since m_player is gone. |
| 3705 m_readyState = HAVE_NOTHING; | 3705 m_readyState = HAVE_NOTHING; |
| 3706 updateMediaController(); | 3706 updateMediaController(); |
| 3707 #if ENABLE(VIDEO_TRACK) | 3707 #if ENABLE(VIDEO_TRACK) |
| 3708 if (RuntimeEnabledFeatures::webkitVideoTrackEnabled()) | 3708 if (RuntimeEnabledFeatures::webkitVideoTrackEnabled()) |
| 3709 updateActiveTextTrackCues(0); | 3709 updateActiveTextTrackCues(0); |
| 3710 #endif | 3710 #endif |
| 3711 } | 3711 } |
| 3712 | 3712 |
| 3713 void HTMLMediaElement::clearMediaPlayer(unsigned flags) | 3713 void HTMLMediaElement::clearMediaPlayer(signed flags) |
| 3714 { | 3714 { |
| 3715 #if !ENABLE(PLUGIN_PROXY_FOR_VIDEO) | 3715 #if !ENABLE(PLUGIN_PROXY_FOR_VIDEO) |
| 3716 m_player.clear(); | 3716 m_player.clear(); |
| 3717 #endif | 3717 #endif |
| 3718 stopPeriodicTimers(); | 3718 stopPeriodicTimers(); |
| 3719 m_loadTimer.stop(); | 3719 m_loadTimer.stop(); |
| 3720 | 3720 |
| 3721 m_pendingLoadFlags &= ~flags; | 3721 m_pendingLoadFlags &= ~flags; |
| 3722 m_loadState = WaitingForSource; | 3722 m_loadState = WaitingForSource; |
| 3723 } | 3723 } |
| (...skipping 850 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4574 return mediaPlayerOwningDocument()->view()->windowClipRect(); | 4574 return mediaPlayerOwningDocument()->view()->windowClipRect(); |
| 4575 } | 4575 } |
| 4576 | 4576 |
| 4577 void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture() | 4577 void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture() |
| 4578 { | 4578 { |
| 4579 m_restrictions = NoRestrictions; | 4579 m_restrictions = NoRestrictions; |
| 4580 } | 4580 } |
| 4581 | 4581 |
| 4582 } | 4582 } |
| 4583 #endif | 4583 #endif |
| OLD | NEW |