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

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

Issue 2406483002: WIP - Add EME (Closed)
Patch Set: Rebase. Split RemotingSourceImpl. Addressed comments. Created 4 years, 2 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
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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 class Point; 99 class Point;
100 class Range; 100 class Range;
101 class Rect; 101 class Rect;
102 } 102 }
103 103
104 namespace media { 104 namespace media {
105 class CdmFactory; 105 class CdmFactory;
106 class DecoderFactory; 106 class DecoderFactory;
107 class MediaPermission; 107 class MediaPermission;
108 class MediaServiceProvider; 108 class MediaServiceProvider;
109 class RemotingController; 109 class RemotingRendererController;
110 class RendererWebMediaPlayerDelegate; 110 class RendererWebMediaPlayerDelegate;
111 class SurfaceManager; 111 class SurfaceManager;
112 class UrlIndex; 112 class UrlIndex;
113 class WebEncryptedMediaClientImpl; 113 class WebEncryptedMediaClientImpl;
114 } 114 }
115 115
116 namespace service_manager { 116 namespace service_manager {
117 class InterfaceRegistry; 117 class InterfaceRegistry;
118 class InterfaceProvider; 118 class InterfaceProvider;
119 } 119 }
(...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 // synchronous find request. 1061 // synchronous find request.
1062 void SendFindReply(int request_id, 1062 void SendFindReply(int request_id,
1063 int match_count, 1063 int match_count,
1064 int ordinal, 1064 int ordinal,
1065 const blink::WebRect& selection_rect, 1065 const blink::WebRect& selection_rect,
1066 bool final_status_update); 1066 bool final_status_update);
1067 1067
1068 void InitializeBlameContext(RenderFrameImpl* parent_frame); 1068 void InitializeBlameContext(RenderFrameImpl* parent_frame);
1069 1069
1070 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) 1070 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
1071 // Creates the RemotingController to control whether to switch to/from media 1071 // Creates the RemotingRendererController to control whether to switch to/from
1072 // media
1072 // remoting from/to local playback. 1073 // remoting from/to local playback.
miu 2016/10/25 04:21:25 nit: This line can go at the end of the line above
xjz 2016/10/26 22:00:25 Done.
1073 std::unique_ptr<media::RemotingController> CreateRemotingController(); 1074 std::unique_ptr<media::RemotingRendererController>
1075 CreateRemotingRendererController();
1074 #endif 1076 #endif
1075 1077
1076 // Stores the WebLocalFrame we are associated with. This is null from the 1078 // Stores the WebLocalFrame we are associated with. This is null from the
1077 // constructor until BindToWebFrame is called, and it is null after 1079 // constructor until BindToWebFrame is called, and it is null after
1078 // frameDetached is called until destruction (which is asynchronous in the 1080 // frameDetached is called until destruction (which is asynchronous in the
1079 // case of the main frame, but not subframes). 1081 // case of the main frame, but not subframes).
1080 blink::WebLocalFrame* frame_; 1082 blink::WebLocalFrame* frame_;
1081 1083
1082 // Boolean value indicating whether this RenderFrameImpl object is for the 1084 // Boolean value indicating whether this RenderFrameImpl object is for the
1083 // main frame or not. It remains accurate during destruction, even when 1085 // main frame or not. It remains accurate during destruction, even when
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
1326 bool name_changed_before_first_commit_ = false; 1328 bool name_changed_before_first_commit_ = false;
1327 1329
1328 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1330 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1329 1331
1330 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1332 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1331 }; 1333 };
1332 1334
1333 } // namespace content 1335 } // namespace content
1334 1336
1335 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1337 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.cc » ('j') | content/renderer/render_frame_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698