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

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

Issue 2224713002: Move WebSocketHandleImpl into Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review feedback except the location of websocket.mojom Created 4 years, 4 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 | « content/renderer/render_frame_impl.h ('k') | content/renderer/renderer_blink_platform_impl.h » ('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 #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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 125 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
126 #include "content/renderer/renderer_webcolorchooser_impl.h" 126 #include "content/renderer/renderer_webcolorchooser_impl.h"
127 #include "content/renderer/savable_resources.h" 127 #include "content/renderer/savable_resources.h"
128 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h" 128 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h"
129 #include "content/renderer/shared_worker_repository.h" 129 #include "content/renderer/shared_worker_repository.h"
130 #include "content/renderer/skia_benchmarking_extension.h" 130 #include "content/renderer/skia_benchmarking_extension.h"
131 #include "content/renderer/stats_collection_controller.h" 131 #include "content/renderer/stats_collection_controller.h"
132 #include "content/renderer/web_frame_utils.h" 132 #include "content/renderer/web_frame_utils.h"
133 #include "content/renderer/web_ui_extension.h" 133 #include "content/renderer/web_ui_extension.h"
134 #include "content/renderer/websharedworker_proxy.h" 134 #include "content/renderer/websharedworker_proxy.h"
135 #include "content/renderer/websockethandle_impl.h"
136 #include "crypto/sha2.h" 135 #include "crypto/sha2.h"
137 #include "gin/modules/module_registry.h" 136 #include "gin/modules/module_registry.h"
138 #include "media/audio/audio_output_device.h" 137 #include "media/audio/audio_output_device.h"
139 #include "media/base/audio_renderer_mixer_input.h" 138 #include "media/base/audio_renderer_mixer_input.h"
140 #include "media/base/cdm_factory.h" 139 #include "media/base/cdm_factory.h"
141 #include "media/base/decoder_factory.h" 140 #include "media/base/decoder_factory.h"
142 #include "media/base/media.h" 141 #include "media/base/media.h"
143 #include "media/base/media_log.h" 142 #include "media/base/media_log.h"
144 #include "media/base/media_switches.h" 143 #include "media/base/media_switches.h"
145 #include "media/blink/url_index.h" 144 #include "media/blink/url_index.h"
(...skipping 4149 matching lines...) Expand 10 before | Expand all | Expand 10 after
4295 presentation_dispatcher_ = new PresentationDispatcher(this); 4294 presentation_dispatcher_ = new PresentationDispatcher(this);
4296 return presentation_dispatcher_; 4295 return presentation_dispatcher_;
4297 } 4296 }
4298 4297
4299 blink::WebPushClient* RenderFrameImpl::pushClient() { 4298 blink::WebPushClient* RenderFrameImpl::pushClient() {
4300 if (!push_messaging_dispatcher_) 4299 if (!push_messaging_dispatcher_)
4301 push_messaging_dispatcher_ = new PushMessagingDispatcher(this); 4300 push_messaging_dispatcher_ = new PushMessagingDispatcher(this);
4302 return push_messaging_dispatcher_; 4301 return push_messaging_dispatcher_;
4303 } 4302 }
4304 4303
4305 void RenderFrameImpl::willOpenWebSocket(blink::WebSocketHandle* handle) {
4306 // Initialize the WebSocketHandle with our InterfaceProvider to provide the
4307 // WebSocket implementation with context about this frame. This is important
4308 // so that the browser can show UI associated with the WebSocket (e.g., for
4309 // certificate errors).
4310 static_cast<WebSocketHandleImpl*>(handle)->Initialize(
4311 blink_interface_provider_.get());
4312 }
4313
4314 void RenderFrameImpl::willStartUsingPeerConnectionHandler( 4304 void RenderFrameImpl::willStartUsingPeerConnectionHandler(
4315 blink::WebRTCPeerConnectionHandler* handler) { 4305 blink::WebRTCPeerConnectionHandler* handler) {
4316 #if defined(ENABLE_WEBRTC) 4306 #if defined(ENABLE_WEBRTC)
4317 static_cast<RTCPeerConnectionHandler*>(handler)->associateWithFrame(frame_); 4307 static_cast<RTCPeerConnectionHandler*>(handler)->associateWithFrame(frame_);
4318 #endif 4308 #endif
4319 } 4309 }
4320 4310
4321 blink::WebUserMediaClient* RenderFrameImpl::userMediaClient() { 4311 blink::WebUserMediaClient* RenderFrameImpl::userMediaClient() {
4322 if (!web_user_media_client_) 4312 if (!web_user_media_client_)
4323 InitializeUserMediaClient(); 4313 InitializeUserMediaClient();
(...skipping 2025 matching lines...) Expand 10 before | Expand all | Expand 10 after
6349 // event target. Potentially a Pepper plugin will receive the event. 6339 // event target. Potentially a Pepper plugin will receive the event.
6350 // In order to tell whether a plugin gets the last mouse event and which it 6340 // In order to tell whether a plugin gets the last mouse event and which it
6351 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6341 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6352 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6342 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6353 // |pepper_last_mouse_event_target_|. 6343 // |pepper_last_mouse_event_target_|.
6354 pepper_last_mouse_event_target_ = nullptr; 6344 pepper_last_mouse_event_target_ = nullptr;
6355 #endif 6345 #endif
6356 } 6346 }
6357 6347
6358 } // namespace content 6348 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/renderer_blink_platform_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698