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

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: Disallow Copy 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 // Make sure the weak pointer factory member is the last member of the class.
153 base::WeakPtrFactory<WebMediaPlayerMSCompositor> weak_ptr_factory_;
154
155 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMSCompositor);
151 }; 156 };
152 } 157 }
153 158
154 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H 159 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_COMPOSITOR_H
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/webmediaplayer_ms_compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698