Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Side by Side Diff: Source/core/html/HTMLMediaElement.cpp

Issue 961243002: Do not reset controls upon removing media element from the DOM. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 579 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 590
591 void HTMLMediaElement::didNotifySubtreeInsertionsToDocument() 591 void HTMLMediaElement::didNotifySubtreeInsertionsToDocument()
592 { 592 {
593 configureMediaControls(); 593 configureMediaControls();
594 } 594 }
595 595
596 void HTMLMediaElement::removedFrom(ContainerNode* insertionPoint) 596 void HTMLMediaElement::removedFrom(ContainerNode* insertionPoint)
597 { 597 {
598 WTF_LOG(Media, "HTMLMediaElement::removedFrom(%p, %p)", this, insertionPoint ); 598 WTF_LOG(Media, "HTMLMediaElement::removedFrom(%p, %p)", this, insertionPoint );
599 599
600 HTMLElement::removedFrom(insertionPoint);
600 if (insertionPoint->inActiveDocument()) { 601 if (insertionPoint->inActiveDocument()) {
601 configureMediaControls(); 602 configureMediaControls();
602 if (m_networkState > NETWORK_EMPTY) 603 if (m_networkState > NETWORK_EMPTY)
603 pause(); 604 pause();
604 } 605 }
605
606 HTMLElement::removedFrom(insertionPoint);
607 } 606 }
608 607
609 void HTMLMediaElement::attach(const AttachContext& context) 608 void HTMLMediaElement::attach(const AttachContext& context)
610 { 609 {
611 HTMLElement::attach(context); 610 HTMLElement::attach(context);
612 611
613 if (renderer()) 612 if (renderer())
614 renderer()->updateFromElement(); 613 renderer()->updateFromElement();
615 } 614 }
616 615
(...skipping 2979 matching lines...) Expand 10 before | Expand all | Expand 10 after
3596 3595
3597 #if ENABLE(WEB_AUDIO) 3596 #if ENABLE(WEB_AUDIO)
3598 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) 3597 void HTMLMediaElement::clearWeakMembers(Visitor* visitor)
3599 { 3598 {
3600 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) 3599 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider())
3601 audioSourceProvider()->setClient(nullptr); 3600 audioSourceProvider()->setClient(nullptr);
3602 } 3601 }
3603 #endif 3602 #endif
3604 3603
3605 } 3604 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698