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

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

Issue 26129006: Fix use-after-free in HTMLMediaElement::contextDestroyed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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, 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 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 m_asyncEventQueue->close(); 324 m_asyncEventQueue->close();
325 325
326 setShouldDelayLoadEvent(false); 326 setShouldDelayLoadEvent(false);
327 if (m_textTracks) 327 if (m_textTracks)
328 m_textTracks->clearOwner(); 328 m_textTracks->clearOwner();
329 if (m_textTracks) { 329 if (m_textTracks) {
330 for (unsigned i = 0; i < m_textTracks->length(); ++i) 330 for (unsigned i = 0; i < m_textTracks->length(); ++i)
331 m_textTracks->item(i)->clearClient(); 331 m_textTracks->item(i)->clearClient();
332 } 332 }
333 333
334 if (m_mediaController) 334 if (m_mediaController) {
335 m_mediaController->removeMediaElement(this); 335 m_mediaController->removeMediaElement(this);
336 m_mediaController = 0;
337 }
336 338
337 closeMediaSource(); 339 closeMediaSource();
338 340
339 #if ENABLE(ENCRYPTED_MEDIA_V2) 341 #if ENABLE(ENCRYPTED_MEDIA_V2)
340 setMediaKeys(0); 342 setMediaKeys(0);
341 #endif 343 #endif
342 344
343 removeElementFromDocumentMap(this, &document()); 345 removeElementFromDocumentMap(this, &document());
344 346
345 // Destroying the player may cause a resource load to be canceled, 347 // Destroying the player may cause a resource load to be canceled,
(...skipping 3645 matching lines...) Expand 10 before | Expand all | Expand 10 after
3991 { 3993 {
3992 m_restrictions = NoRestrictions; 3994 m_restrictions = NoRestrictions;
3993 } 3995 }
3994 3996
3995 void HTMLMediaElement::mediaPlayerScheduleLayerUpdate() 3997 void HTMLMediaElement::mediaPlayerScheduleLayerUpdate()
3996 { 3998 {
3997 scheduleLayerUpdate(); 3999 scheduleLayerUpdate();
3998 } 4000 }
3999 4001
4000 } 4002 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698