| 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 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 532 m_inActiveDocument = false; | 532 m_inActiveDocument = false; |
| 533 if (insertionPoint->inDocument()) { | 533 if (insertionPoint->inDocument()) { |
| 534 configureMediaControls(); | 534 configureMediaControls(); |
| 535 if (m_networkState > NETWORK_EMPTY) | 535 if (m_networkState > NETWORK_EMPTY) |
| 536 pause(); | 536 pause(); |
| 537 } | 537 } |
| 538 | 538 |
| 539 HTMLElement::removedFrom(insertionPoint); | 539 HTMLElement::removedFrom(insertionPoint); |
| 540 } | 540 } |
| 541 | 541 |
| 542 void HTMLMediaElement::attach() | 542 void HTMLMediaElement::attach(const AttachContext& context) |
| 543 { | 543 { |
| 544 ASSERT(!attached()); | 544 ASSERT(!attached()); |
| 545 | 545 |
| 546 HTMLElement::attach(); | 546 HTMLElement::attach(context); |
| 547 | 547 |
| 548 if (renderer()) | 548 if (renderer()) |
| 549 renderer()->updateFromElement(); | 549 renderer()->updateFromElement(); |
| 550 } | 550 } |
| 551 | 551 |
| 552 void HTMLMediaElement::didRecalcStyle(StyleChange) | 552 void HTMLMediaElement::didRecalcStyle(StyleChange) |
| 553 { | 553 { |
| 554 if (renderer()) | 554 if (renderer()) |
| 555 renderer()->updateFromElement(); | 555 renderer()->updateFromElement(); |
| 556 } | 556 } |
| (...skipping 3413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3970 info.addMember(m_mediaGroup, "mediaGroup"); | 3970 info.addMember(m_mediaGroup, "mediaGroup"); |
| 3971 info.addMember(m_mediaController, "mediaController"); | 3971 info.addMember(m_mediaController, "mediaController"); |
| 3972 | 3972 |
| 3973 #if ENABLE(WEB_AUDIO) | 3973 #if ENABLE(WEB_AUDIO) |
| 3974 info.addMember(m_audioSourceNode, "audioSourceNode"); | 3974 info.addMember(m_audioSourceNode, "audioSourceNode"); |
| 3975 #endif | 3975 #endif |
| 3976 | 3976 |
| 3977 } | 3977 } |
| 3978 | 3978 |
| 3979 } | 3979 } |
| OLD | NEW |