| 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 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 410 else { | 410 else { |
| 411 // The spec does not define an "invalid value default" but "auto" is
suggested as the | 411 // The spec does not define an "invalid value default" but "auto" is
suggested as the |
| 412 // "missing value default", so use it for everything except "none" a
nd "metadata" | 412 // "missing value default", so use it for everything except "none" a
nd "metadata" |
| 413 m_preload = MediaPlayer::Auto; | 413 m_preload = MediaPlayer::Auto; |
| 414 } | 414 } |
| 415 | 415 |
| 416 // The attribute must be ignored if the autoplay attribute is present | 416 // The attribute must be ignored if the autoplay attribute is present |
| 417 if (!autoplay() && m_player) | 417 if (!autoplay() && m_player) |
| 418 setPlayerPreload(); | 418 setPlayerPreload(); |
| 419 | 419 |
| 420 } else if (name == mediagroupAttr) { | 420 } else if (name == mediagroupAttr && RuntimeEnabledFeatures::mediaController
Enabled()) { |
| 421 setMediaGroup(value); | 421 setMediaGroup(value); |
| 422 } else { | 422 } else { |
| 423 HTMLElement::parseAttribute(name, value); | 423 HTMLElement::parseAttribute(name, value); |
| 424 } | 424 } |
| 425 } | 425 } |
| 426 | 426 |
| 427 void HTMLMediaElement::finishParsingChildren() | 427 void HTMLMediaElement::finishParsingChildren() |
| 428 { | 428 { |
| 429 HTMLElement::finishParsingChildren(); | 429 HTMLElement::finishParsingChildren(); |
| 430 | 430 |
| (...skipping 3202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3633 | 3633 |
| 3634 void HTMLMediaElement::trace(Visitor* visitor) | 3634 void HTMLMediaElement::trace(Visitor* visitor) |
| 3635 { | 3635 { |
| 3636 visitor->trace(m_textTracks); | 3636 visitor->trace(m_textTracks); |
| 3637 visitor->trace(m_textTracksWhenResourceSelectionBegan); | 3637 visitor->trace(m_textTracksWhenResourceSelectionBegan); |
| 3638 Supplementable<HTMLMediaElement>::trace(visitor); | 3638 Supplementable<HTMLMediaElement>::trace(visitor); |
| 3639 HTMLElement::trace(visitor); | 3639 HTMLElement::trace(visitor); |
| 3640 } | 3640 } |
| 3641 | 3641 |
| 3642 } | 3642 } |
| OLD | NEW |