third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp - Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)

Patch Set: More fixes - things build fine at this point. Created 3 years, 8 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:

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 383ece124c3f67e335e55ae5ec3ce76c5247ebd0..fa3d256ce152f6b3811969b12067e7e26af65f43 100644

--- a/third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp

+++ b/third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp

@@ -691,6 +691,8 @@ T* findExistingTrackById(const TrackListBase<T>& trackList, const String& id) {

// one that we had in previous init segments.

if (trackList.length() == 1)

return trackList.anonymousIndexedGetter(0);

+ /* DO NOT SUBMIT - merge conflict marker.

+ * Please spell |getTrackById|, not |GetTrackById| below. */

return trackList.getTrackById(id);

}