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

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

Issue 587393002: Oilpan: make Supplementable tracing more regular. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Improve dummy trace() comment Created 6 years, 3 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 | « Source/core/frame/Screen.cpp ('k') | Source/core/page/Page.cpp » ('j') | 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 3981 matching lines...) Expand 10 before | Expand all | Expand 10 after
3992 { 3992 {
3993 if (event->type() == EventTypeNames::focusin) { 3993 if (event->type() == EventTypeNames::focusin) {
3994 if (hasMediaControls()) 3994 if (hasMediaControls())
3995 mediaControls()->mediaElementFocused(); 3995 mediaControls()->mediaElementFocused();
3996 } 3996 }
3997 HTMLElement::defaultEventHandler(event); 3997 HTMLElement::defaultEventHandler(event);
3998 } 3998 }
3999 3999
4000 void HTMLMediaElement::trace(Visitor* visitor) 4000 void HTMLMediaElement::trace(Visitor* visitor)
4001 { 4001 {
4002 #if ENABLE(OILPAN)
4002 visitor->trace(m_playedTimeRanges); 4003 visitor->trace(m_playedTimeRanges);
4003 visitor->trace(m_asyncEventQueue); 4004 visitor->trace(m_asyncEventQueue);
4004 visitor->trace(m_error); 4005 visitor->trace(m_error);
4005 visitor->trace(m_currentSourceNode); 4006 visitor->trace(m_currentSourceNode);
4006 visitor->trace(m_nextChildNodeToConsider); 4007 visitor->trace(m_nextChildNodeToConsider);
4007 visitor->trace(m_mediaSource); 4008 visitor->trace(m_mediaSource);
4008 visitor->trace(m_audioTracks); 4009 visitor->trace(m_audioTracks);
4009 visitor->trace(m_videoTracks); 4010 visitor->trace(m_videoTracks);
4010 visitor->trace(m_textTracks); 4011 visitor->trace(m_textTracks);
4011 visitor->trace(m_textTracksWhenResourceSelectionBegan); 4012 visitor->trace(m_textTracksWhenResourceSelectionBegan);
4012 visitor->trace(m_mediaController); 4013 visitor->trace(m_mediaController);
4013 #if ENABLE(WEB_AUDIO) 4014 #if ENABLE(WEB_AUDIO)
4014 visitor->registerWeakMembers<HTMLMediaElement, &HTMLMediaElement::clearWeakM embers>(this); 4015 visitor->registerWeakMembers<HTMLMediaElement, &HTMLMediaElement::clearWeakM embers>(this);
4015 #endif 4016 #endif
4016 WillBeHeapSupplementable<HTMLMediaElement>::trace(visitor); 4017 HeapSupplementable<HTMLMediaElement>::trace(visitor);
4018 #endif
4017 HTMLElement::trace(visitor); 4019 HTMLElement::trace(visitor);
4018 } 4020 }
4019 4021
4020 void HTMLMediaElement::createPlaceholderTracksIfNecessary() 4022 void HTMLMediaElement::createPlaceholderTracksIfNecessary()
4021 { 4023 {
4022 if (!RuntimeEnabledFeatures::audioVideoTracksEnabled()) 4024 if (!RuntimeEnabledFeatures::audioVideoTracksEnabled())
4023 return; 4025 return;
4024 4026
4025 // Create a placeholder audio track if the player says it has audio but it d idn't explicitly announce the tracks. 4027 // Create a placeholder audio track if the player says it has audio but it d idn't explicitly announce the tracks.
4026 if (hasAudio() && !audioTracks().length()) 4028 if (hasAudio() && !audioTracks().length())
(...skipping 20 matching lines...) Expand all
4047 4049
4048 #if ENABLE(WEB_AUDIO) 4050 #if ENABLE(WEB_AUDIO)
4049 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) 4051 void HTMLMediaElement::clearWeakMembers(Visitor* visitor)
4050 { 4052 {
4051 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) 4053 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider())
4052 audioSourceProvider()->setClient(0); 4054 audioSourceProvider()->setClient(0);
4053 } 4055 }
4054 #endif 4056 #endif
4055 4057
4056 } 4058 }
OLDNEW
« no previous file with comments | « Source/core/frame/Screen.cpp ('k') | Source/core/page/Page.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698