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

Side by Side Diff: content/renderer/render_frame_impl.h

Issue 2819973002: Fix incorrect collation of media logs. (Closed)
Patch Set: Fix typo in comment. 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:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 class MediaPermissionDispatcher; 148 class MediaPermissionDispatcher;
149 class NavigationState; 149 class NavigationState;
150 class PepperPluginInstanceImpl; 150 class PepperPluginInstanceImpl;
151 class PresentationDispatcher; 151 class PresentationDispatcher;
152 class PushMessagingClient; 152 class PushMessagingClient;
153 class RelatedAppsFetcher; 153 class RelatedAppsFetcher;
154 class RenderAccessibilityImpl; 154 class RenderAccessibilityImpl;
155 class RendererMediaPlayerManager; 155 class RendererMediaPlayerManager;
156 class RendererPpapiHost; 156 class RendererPpapiHost;
157 class RenderFrameObserver; 157 class RenderFrameObserver;
158 class RenderMediaLog;
159 class RenderViewImpl; 158 class RenderViewImpl;
160 class RenderWidget; 159 class RenderWidget;
161 class RenderWidgetFullscreenPepper; 160 class RenderWidgetFullscreenPepper;
162 class ResourceRequestBodyImpl; 161 class ResourceRequestBodyImpl;
163 class ScreenOrientationDispatcher; 162 class ScreenOrientationDispatcher;
164 class SharedWorkerRepository; 163 class SharedWorkerRepository;
165 class UserMediaClientImpl; 164 class UserMediaClientImpl;
166 struct CSPViolationParams; 165 struct CSPViolationParams;
167 struct CommonNavigationParams; 166 struct CommonNavigationParams;
168 struct CustomContextMenuContext; 167 struct CustomContextMenuContext;
(...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after
1111 // Sends a reply to the current find operation handling if it was a 1110 // Sends a reply to the current find operation handling if it was a
1112 // synchronous find request. 1111 // synchronous find request.
1113 void SendFindReply(int request_id, 1112 void SendFindReply(int request_id,
1114 int match_count, 1113 int match_count,
1115 int ordinal, 1114 int ordinal,
1116 const blink::WebRect& selection_rect, 1115 const blink::WebRect& selection_rect,
1117 bool final_status_update); 1116 bool final_status_update);
1118 1117
1119 void InitializeBlameContext(RenderFrameImpl* parent_frame); 1118 void InitializeBlameContext(RenderFrameImpl* parent_frame);
1120 1119
1121 // Lazy constructs a RenderMediaLog for use across owned media objects.
1122 const scoped_refptr<RenderMediaLog>& GetMediaLog();
1123
1124 // Stores the WebLocalFrame we are associated with. This is null from the 1120 // Stores the WebLocalFrame we are associated with. This is null from the
1125 // constructor until BindToWebFrame is called, and it is null after 1121 // constructor until BindToWebFrame is called, and it is null after
1126 // frameDetached is called until destruction (which is asynchronous in the 1122 // frameDetached is called until destruction (which is asynchronous in the
1127 // case of the main frame, but not subframes). 1123 // case of the main frame, but not subframes).
1128 blink::WebLocalFrame* frame_; 1124 blink::WebLocalFrame* frame_;
1129 1125
1130 // Boolean value indicating whether this RenderFrameImpl object is for the 1126 // Boolean value indicating whether this RenderFrameImpl object is for the
1131 // main frame or not. It remains accurate during destruction, even when 1127 // main frame or not. It remains accurate during destruction, even when
1132 // |frame_| has been invalidated. 1128 // |frame_| has been invalidated.
1133 bool is_main_frame_; 1129 bool is_main_frame_;
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1234 // of handling a InputMsg_SelectRange IPC. 1230 // of handling a InputMsg_SelectRange IPC.
1235 bool handling_select_range_; 1231 bool handling_select_range_;
1236 1232
1237 // The next group of objects all implement RenderFrameObserver, so are deleted 1233 // The next group of objects all implement RenderFrameObserver, so are deleted
1238 // along with the RenderFrame automatically. This is why we just store weak 1234 // along with the RenderFrame automatically. This is why we just store weak
1239 // references. 1235 // references.
1240 1236
1241 // Destroyed via the RenderFrameObserver::OnDestruct() mechanism. 1237 // Destroyed via the RenderFrameObserver::OnDestruct() mechanism.
1242 UserMediaClientImpl* web_user_media_client_; 1238 UserMediaClientImpl* web_user_media_client_;
1243 1239
1244 scoped_refptr<RenderMediaLog> media_log_;
1245
1246 // EncryptedMediaClient attached to this frame; lazily initialized. 1240 // EncryptedMediaClient attached to this frame; lazily initialized.
1247 std::unique_ptr<media::WebEncryptedMediaClientImpl> 1241 std::unique_ptr<media::WebEncryptedMediaClientImpl>
1248 web_encrypted_media_client_; 1242 web_encrypted_media_client_;
1249 1243
1250 // The media permission dispatcher attached to this frame. 1244 // The media permission dispatcher attached to this frame.
1251 std::unique_ptr<MediaPermissionDispatcher> media_permission_dispatcher_; 1245 std::unique_ptr<MediaPermissionDispatcher> media_permission_dispatcher_;
1252 1246
1253 #if defined(ENABLE_MOJO_MEDIA) 1247 #if defined(ENABLE_MOJO_MEDIA)
1254 // The media interface provider attached to this frame, lazily initialized. 1248 // The media interface provider attached to this frame, lazily initialized.
1255 std::unique_ptr<MediaInterfaceProvider> media_interface_provider_; 1249 std::unique_ptr<MediaInterfaceProvider> media_interface_provider_;
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
1428 std::unique_ptr<PendingNavigationInfo> pending_navigation_info_; 1422 std::unique_ptr<PendingNavigationInfo> pending_navigation_info_;
1429 1423
1430 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1424 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1431 1425
1432 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1426 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1433 }; 1427 };
1434 1428
1435 } // namespace content 1429 } // namespace content
1436 1430
1437 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1431 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698