content/renderer/media/webmediaplayer_ms_compositor.h - Issue 1565893002: Bug Fix: WebMediaPlayerMS Crashes

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: content/renderer/media/webmediaplayer_ms_compositor.h

Issue 1565893002: Bug Fix: WebMediaPlayerMS Crashes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: WeakPtrFactory Created 4 years, 11 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 | « no previous file | content/renderer/media/webmediaplayer_ms_compositor.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H	5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H

6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H	6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H

7	7

8 #include <stddef.h>	8 #include <stddef.h>

9	9

10 #include <map>	10 #include <map>

(...skipping 130 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
141 size_t total_frame_count_;	141 size_t total_frame_count_;

142 size_t dropped_frame_count_;	142 size_t dropped_frame_count_;

143	143

144 bool stopped_;	144 bool stopped_;

145	145

146 std::map<base::TimeDelta, base::TimeTicks> timestamps_to_clock_times_;	146 std::map<base::TimeDelta, base::TimeTicks> timestamps_to_clock_times_;

147	147

148 // \|current_frame_lock_\| protects \|current_frame_used_by_compositor_\|,	148 // \|current_frame_lock_\| protects \|current_frame_used_by_compositor_\|,

149 // \|current_frame_\|, and \|rendering_frame_buffer_\|.	149 // \|current_frame_\|, and \|rendering_frame_buffer_\|.

150 base::Lock current_frame_lock_;	150 base::Lock current_frame_lock_;

	151

	152 base::WeakPtrFactory<WebMediaPlayerMSCompositor> weak_ptr_factory_;

151 };	153 };
	DaleCurtis 2016/01/08 18:56:17 Can you add a DISALLOW_COPY_AND_ASSIGN(...) while Can you add a DISALLOW_COPY_AND_ASSIGN(...) while you're here? Adding a comment to the weak factory saying it must always be the last member variable is a good idea too. qiangchen 2016/01/08 22:09:39 Done. Show quoted text On 2016/01/08 18:56:17, DaleCurtis wrote: > Can you add a DISALLOW_COPY_AND_ASSIGN(...) while you're here? Adding a comment > to the weak factory saying it must always be the last member variable is a good > idea too. Done.
152 }	154 }

153	155

154 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H	156 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H

OLD	NEW