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

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

Issue 10979026: Merge 129296 - HTMLMediaElement isn't garbage collected between document reloads (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/
Patch Set: Created 8 years, 2 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
« no previous file with comments | « ManualTests/audio-freed-during-reload.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 3657 matching lines...) Expand 10 before | Expand all | Expand 10 after
3668 void HTMLMediaElement::stop() 3668 void HTMLMediaElement::stop()
3669 { 3669 {
3670 LOG(Media, "HTMLMediaElement::stop"); 3670 LOG(Media, "HTMLMediaElement::stop");
3671 if (m_isFullscreen) 3671 if (m_isFullscreen)
3672 exitFullscreen(); 3672 exitFullscreen();
3673 3673
3674 m_inActiveDocument = false; 3674 m_inActiveDocument = false;
3675 userCancelledLoad(); 3675 userCancelledLoad();
3676 3676
3677 // Stop the playback without generating events 3677 // Stop the playback without generating events
3678 m_playing = false;
3678 setPausedInternal(true); 3679 setPausedInternal(true);
3679 3680
3680 if (renderer()) 3681 if (renderer())
3681 renderer()->updateFromElement(); 3682 renderer()->updateFromElement();
3682 3683
3683 stopPeriodicTimers(); 3684 stopPeriodicTimers();
3684 cancelPendingEventsAndCallbacks(); 3685 cancelPendingEventsAndCallbacks();
3685 } 3686 }
3686 3687
3687 void HTMLMediaElement::suspend(ReasonForSuspension why) 3688 void HTMLMediaElement::suspend(ReasonForSuspension why)
(...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after
4492 return mediaPlayerOwningDocument()->view()->windowClipRect(); 4493 return mediaPlayerOwningDocument()->view()->windowClipRect();
4493 } 4494 }
4494 4495
4495 void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture() 4496 void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture()
4496 { 4497 {
4497 m_restrictions = NoRestrictions; 4498 m_restrictions = NoRestrictions;
4498 } 4499 }
4499 4500
4500 } 4501 }
4501 #endif 4502 #endif
OLDNEW
« no previous file with comments | « ManualTests/audio-freed-during-reload.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698