| 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 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 else { | 425 else { |
| 426 // The spec does not define an "invalid value default" but "auto" is
suggested as the | 426 // The spec does not define an "invalid value default" but "auto" is
suggested as the |
| 427 // "missing value default", so use it for everything except "none" a
nd "metadata" | 427 // "missing value default", so use it for everything except "none" a
nd "metadata" |
| 428 m_preload = MediaPlayer::Auto; | 428 m_preload = MediaPlayer::Auto; |
| 429 } | 429 } |
| 430 | 430 |
| 431 // The attribute must be ignored if the autoplay attribute is present | 431 // The attribute must be ignored if the autoplay attribute is present |
| 432 if (!autoplay() && m_player) | 432 if (!autoplay() && m_player) |
| 433 setPlayerPreload(); | 433 setPlayerPreload(); |
| 434 | 434 |
| 435 } else if (name == mediagroupAttr) { | 435 } else if (name == mediagroupAttr && RuntimeEnabledFeatures::mediaController
Enabled()) { |
| 436 setMediaGroup(value); | 436 setMediaGroup(value); |
| 437 } else { | 437 } else { |
| 438 HTMLElement::parseAttribute(name, value); | 438 HTMLElement::parseAttribute(name, value); |
| 439 } | 439 } |
| 440 } | 440 } |
| 441 | 441 |
| 442 void HTMLMediaElement::finishParsingChildren() | 442 void HTMLMediaElement::finishParsingChildren() |
| 443 { | 443 { |
| 444 HTMLElement::finishParsingChildren(); | 444 HTMLElement::finishParsingChildren(); |
| 445 | 445 |
| (...skipping 3188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3634 | 3634 |
| 3635 void HTMLMediaElement::trace(Visitor* visitor) | 3635 void HTMLMediaElement::trace(Visitor* visitor) |
| 3636 { | 3636 { |
| 3637 visitor->trace(m_textTracks); | 3637 visitor->trace(m_textTracks); |
| 3638 visitor->trace(m_textTracksWhenResourceSelectionBegan); | 3638 visitor->trace(m_textTracksWhenResourceSelectionBegan); |
| 3639 Supplementable<HTMLMediaElement>::trace(visitor); | 3639 Supplementable<HTMLMediaElement>::trace(visitor); |
| 3640 HTMLElement::trace(visitor); | 3640 HTMLElement::trace(visitor); |
| 3641 } | 3641 } |
| 3642 | 3642 |
| 3643 } | 3643 } |
| OLD | NEW |