| Index: third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp
|
| diff --git a/third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp b/third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp
|
| index 039b91e664f8a34d3c2df5000945be1e5818c052..5823fa55a0bf0d6802402a61b8868e2ba32a1ab3 100644
|
| --- a/third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp
|
| +++ b/third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp
|
| @@ -690,9 +690,11 @@ T* findExistingTrackById(const TrackListBase<T>& trackList, const String& id) {
|
| // I.e. we only need to search by TrackID if there is more than one track,
|
| // otherwise we can assume that the only track of the given type is the same
|
| // one that we had in previous init segments.
|
| - if (trackList.length() == 1)
|
| - return trackList.anonymousIndexedGetter(0);
|
| - return trackList.getTrackById(id);
|
| + if (track_list.GetLength() == 1)
|
| + return track_list.AnonymousIndexedGetter(0);
|
| + /* DO NOT SUBMIT - merge conflict marker.
|
| + * Please spell |getTrackById|, not |GetTrackById| below. */
|
| + return track_list.getTrackById(id);
|
| }
|
|
|
| const TrackDefault* SourceBuffer::getTrackDefault(
|
|
|