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

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

Issue 2129913005: Revert of Web MIDI: use mojom::blink::PermissionService directly to ask permission (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 #include "content/renderer/history_serialization.h" 100 #include "content/renderer/history_serialization.h"
101 #include "content/renderer/image_downloader/image_downloader_impl.h" 101 #include "content/renderer/image_downloader/image_downloader_impl.h"
102 #include "content/renderer/ime_event_guard.h" 102 #include "content/renderer/ime_event_guard.h"
103 #include "content/renderer/input/input_handler_manager.h" 103 #include "content/renderer/input/input_handler_manager.h"
104 #include "content/renderer/internal_document_state_data.h" 104 #include "content/renderer/internal_document_state_data.h"
105 #include "content/renderer/manifest/manifest_manager.h" 105 #include "content/renderer/manifest/manifest_manager.h"
106 #include "content/renderer/media/audio_device_factory.h" 106 #include "content/renderer/media/audio_device_factory.h"
107 #include "content/renderer/media/media_permission_dispatcher.h" 107 #include "content/renderer/media/media_permission_dispatcher.h"
108 #include "content/renderer/media/media_stream_dispatcher.h" 108 #include "content/renderer/media/media_stream_dispatcher.h"
109 #include "content/renderer/media/media_stream_renderer_factory_impl.h" 109 #include "content/renderer/media/media_stream_renderer_factory_impl.h"
110 #include "content/renderer/media/midi_dispatcher.h"
110 #include "content/renderer/media/render_media_log.h" 111 #include "content/renderer/media/render_media_log.h"
111 #include "content/renderer/media/renderer_webmediaplayer_delegate.h" 112 #include "content/renderer/media/renderer_webmediaplayer_delegate.h"
112 #include "content/renderer/media/user_media_client_impl.h" 113 #include "content/renderer/media/user_media_client_impl.h"
113 #include "content/renderer/media/web_media_element_source_utils.h" 114 #include "content/renderer/media/web_media_element_source_utils.h"
114 #include "content/renderer/media/webmediaplayer_ms.h" 115 #include "content/renderer/media/webmediaplayer_ms.h"
115 #include "content/renderer/mojo/interface_provider_js_wrapper.h" 116 #include "content/renderer/mojo/interface_provider_js_wrapper.h"
116 #include "content/renderer/mojo_bindings_controller.h" 117 #include "content/renderer/mojo_bindings_controller.h"
117 #include "content/renderer/navigation_state_impl.h" 118 #include "content/renderer/navigation_state_impl.h"
118 #include "content/renderer/notification_permission_dispatcher.h" 119 #include "content/renderer/notification_permission_dispatcher.h"
119 #include "content/renderer/pepper/pepper_audio_controller.h" 120 #include "content/renderer/pepper/pepper_audio_controller.h"
(...skipping 945 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 #if defined(ENABLE_PLUGINS) 1066 #if defined(ENABLE_PLUGINS)
1066 plugin_power_saver_helper_(nullptr), 1067 plugin_power_saver_helper_(nullptr),
1067 plugin_find_handler_(nullptr), 1068 plugin_find_handler_(nullptr),
1068 #endif 1069 #endif
1069 cookie_jar_(this), 1070 cookie_jar_(this),
1070 selection_text_offset_(0), 1071 selection_text_offset_(0),
1071 selection_range_(gfx::Range::InvalidRange()), 1072 selection_range_(gfx::Range::InvalidRange()),
1072 handling_select_range_(false), 1073 handling_select_range_(false),
1073 notification_permission_dispatcher_(NULL), 1074 notification_permission_dispatcher_(NULL),
1074 web_user_media_client_(NULL), 1075 web_user_media_client_(NULL),
1076 midi_dispatcher_(NULL),
1075 #if defined(OS_ANDROID) 1077 #if defined(OS_ANDROID)
1076 media_player_manager_(NULL), 1078 media_player_manager_(NULL),
1077 media_session_manager_(NULL), 1079 media_session_manager_(NULL),
1078 #endif 1080 #endif
1079 media_surface_manager_(nullptr), 1081 media_surface_manager_(nullptr),
1080 #if defined(ENABLE_BROWSER_CDMS) 1082 #if defined(ENABLE_BROWSER_CDMS)
1081 cdm_manager_(NULL), 1083 cdm_manager_(NULL),
1082 #endif 1084 #endif
1083 #if defined(VIDEO_HOLE) 1085 #if defined(VIDEO_HOLE)
1084 contains_media_player_(false), 1086 contains_media_player_(false),
(...skipping 3235 matching lines...) Expand 10 before | Expand all | Expand 10 after
4320 // base::Unretained(this) is safe because WebEncryptedMediaClientImpl 4322 // base::Unretained(this) is safe because WebEncryptedMediaClientImpl
4321 // is destructed before |this|, and does not give away ownership of the 4323 // is destructed before |this|, and does not give away ownership of the
4322 // callback. 4324 // callback.
4323 base::Bind(&RenderFrameImpl::AreSecureCodecsSupported, 4325 base::Bind(&RenderFrameImpl::AreSecureCodecsSupported,
4324 base::Unretained(this)), 4326 base::Unretained(this)),
4325 GetCdmFactory(), GetMediaPermission())); 4327 GetCdmFactory(), GetMediaPermission()));
4326 } 4328 }
4327 return web_encrypted_media_client_.get(); 4329 return web_encrypted_media_client_.get();
4328 } 4330 }
4329 4331
4332 blink::WebMIDIClient* RenderFrameImpl::webMIDIClient() {
4333 if (!midi_dispatcher_)
4334 midi_dispatcher_ = new MidiDispatcher(this);
4335 return midi_dispatcher_;
4336 }
4337
4330 blink::WebString RenderFrameImpl::userAgentOverride() { 4338 blink::WebString RenderFrameImpl::userAgentOverride() {
4331 if (!render_view_->webview() || !render_view_->webview()->mainFrame() || 4339 if (!render_view_->webview() || !render_view_->webview()->mainFrame() ||
4332 render_view_->renderer_preferences_.user_agent_override.empty()) { 4340 render_view_->renderer_preferences_.user_agent_override.empty()) {
4333 return blink::WebString(); 4341 return blink::WebString();
4334 } 4342 }
4335 4343
4336 // TODO(nasko): When the top-level frame is remote, there is no WebDataSource 4344 // TODO(nasko): When the top-level frame is remote, there is no WebDataSource
4337 // associated with it, so the checks below are not valid. Temporarily 4345 // associated with it, so the checks below are not valid. Temporarily
4338 // return early and fix properly as part of https://crbug.com/426555. 4346 // return early and fix properly as part of https://crbug.com/426555.
4339 if (render_view_->webview()->mainFrame()->isWebRemoteFrame()) 4347 if (render_view_->webview()->mainFrame()->isWebRemoteFrame())
(...skipping 1980 matching lines...) Expand 10 before | Expand all | Expand 10 after
6320 // event target. Potentially a Pepper plugin will receive the event. 6328 // event target. Potentially a Pepper plugin will receive the event.
6321 // In order to tell whether a plugin gets the last mouse event and which it 6329 // In order to tell whether a plugin gets the last mouse event and which it
6322 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6330 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6323 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6331 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6324 // |pepper_last_mouse_event_target_|. 6332 // |pepper_last_mouse_event_target_|.
6325 pepper_last_mouse_event_target_ = nullptr; 6333 pepper_last_mouse_event_target_ = nullptr;
6326 #endif 6334 #endif
6327 } 6335 }
6328 6336
6329 } // namespace content 6337 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | third_party/WebKit/LayoutTests/webmidi/loopback-receive.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698