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

Side by Side Diff: Source/modules/mediastream/MediaStream.h

Issue 106423003: [oilpan] Rename visit to mark. (Closed) Base URL: svn://svn.chromium.org/blink/branches/oilpan
Patch Set: Fix typo Created 7 years 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Ericsson AB. All rights reserved. 3 * Copyright (C) 2011 Ericsson AB. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 static PassRefPtr<MediaStream> create(ScriptExecutionContext*, PassRefPtr<Me diaStream>); 47 static PassRefPtr<MediaStream> create(ScriptExecutionContext*, PassRefPtr<Me diaStream>);
48 static PassRefPtr<MediaStream> create(ScriptExecutionContext*, const MediaSt reamTrackVector&); 48 static PassRefPtr<MediaStream> create(ScriptExecutionContext*, const MediaSt reamTrackVector&);
49 static PassRefPtr<MediaStream> create(ScriptExecutionContext*, PassRefPtr<Me diaStreamDescriptor>); 49 static PassRefPtr<MediaStream> create(ScriptExecutionContext*, PassRefPtr<Me diaStreamDescriptor>);
50 virtual ~MediaStream(); 50 virtual ~MediaStream();
51 51
52 virtual void trace(Visitor* visitor) 52 virtual void trace(Visitor* visitor)
53 { 53 {
54 visitor->trace(m_scriptExecutionContext); 54 visitor->trace(m_scriptExecutionContext);
55 } 55 }
56 56
57 virtual void visitWith(Visitor* visitor) const OVERRIDE 57 virtual void adjustAndMark(Visitor* visitor) const OVERRIDE
58 { 58 {
59 visitor->visit(this); 59 visitor->mark(this);
60 } 60 }
61 61
62 // DEPRECATED 62 // DEPRECATED
63 String label() const { return m_descriptor->id(); } 63 String label() const { return m_descriptor->id(); }
64 64
65 String id() const { return m_descriptor->id(); } 65 String id() const { return m_descriptor->id(); }
66 66
67 void addTrack(PassRefPtr<MediaStreamTrack>, ExceptionCode&); 67 void addTrack(PassRefPtr<MediaStreamTrack>, ExceptionCode&);
68 void removeTrack(PassRefPtr<MediaStreamTrack>, ExceptionCode&); 68 void removeTrack(PassRefPtr<MediaStreamTrack>, ExceptionCode&);
69 MediaStreamTrack* getTrackById(String); 69 MediaStreamTrack* getTrackById(String);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 Vector<RefPtr<Event> > m_scheduledEvents; 118 Vector<RefPtr<Event> > m_scheduledEvents;
119 }; 119 };
120 120
121 typedef Vector<RefPtr<MediaStream> > MediaStreamVector; 121 typedef Vector<RefPtr<MediaStream> > MediaStreamVector;
122 122
123 } // namespace WebCore 123 } // namespace WebCore
124 124
125 #endif // ENABLE(MEDIA_STREAM) 125 #endif // ENABLE(MEDIA_STREAM)
126 126
127 #endif // MediaStream_h 127 #endif // MediaStream_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698