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

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

Issue 2279763003: Revert "Move WebSocketHandleImpl into Blink" (Closed)
Patch Set: Created 4 years, 3 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"
135 #include "crypto/sha2.h" 136 #include "crypto/sha2.h"
136 #include "gin/modules/module_registry.h" 137 #include "gin/modules/module_registry.h"
137 #include "media/audio/audio_output_device.h" 138 #include "media/audio/audio_output_device.h"
138 #include "media/base/audio_renderer_mixer_input.h" 139 #include "media/base/audio_renderer_mixer_input.h"
139 #include "media/base/cdm_factory.h" 140 #include "media/base/cdm_factory.h"
140 #include "media/base/decoder_factory.h" 141 #include "media/base/decoder_factory.h"
141 #include "media/base/media.h" 142 #include "media/base/media.h"
142 #include "media/base/media_log.h" 143 #include "media/base/media_log.h"
143 #include "media/base/media_switches.h" 144 #include "media/base/media_switches.h"
144 #include "media/blink/url_index.h" 145 #include "media/blink/url_index.h"
(...skipping 4154 matching lines...) Expand 10 before | Expand all | Expand 10 after
4299 presentation_dispatcher_ = new PresentationDispatcher(this); 4300 presentation_dispatcher_ = new PresentationDispatcher(this);
4300 return presentation_dispatcher_; 4301 return presentation_dispatcher_;
4301 } 4302 }
4302 4303
4303 blink::WebPushClient* RenderFrameImpl::pushClient() { 4304 blink::WebPushClient* RenderFrameImpl::pushClient() {
4304 if (!push_messaging_dispatcher_) 4305 if (!push_messaging_dispatcher_)
4305 push_messaging_dispatcher_ = new PushMessagingDispatcher(this); 4306 push_messaging_dispatcher_ = new PushMessagingDispatcher(this);
4306 return push_messaging_dispatcher_; 4307 return push_messaging_dispatcher_;
4307 } 4308 }
4308 4309
4310 void RenderFrameImpl::willOpenWebSocket(blink::WebSocketHandle* handle) {
4311 // Initialize the WebSocketHandle with our InterfaceProvider to provide the
4312 // WebSocket implementation with context about this frame. This is important
4313 // so that the browser can show UI associated with the WebSocket (e.g., for
4314 // certificate errors).
4315 static_cast<WebSocketHandleImpl*>(handle)->Initialize(
4316 blink_interface_provider_.get());
4317 }
4318
4309 void RenderFrameImpl::willStartUsingPeerConnectionHandler( 4319 void RenderFrameImpl::willStartUsingPeerConnectionHandler(
4310 blink::WebRTCPeerConnectionHandler* handler) { 4320 blink::WebRTCPeerConnectionHandler* handler) {
4311 #if defined(ENABLE_WEBRTC) 4321 #if defined(ENABLE_WEBRTC)
4312 static_cast<RTCPeerConnectionHandler*>(handler)->associateWithFrame(frame_); 4322 static_cast<RTCPeerConnectionHandler*>(handler)->associateWithFrame(frame_);
4313 #endif 4323 #endif
4314 } 4324 }
4315 4325
4316 blink::WebUserMediaClient* RenderFrameImpl::userMediaClient() { 4326 blink::WebUserMediaClient* RenderFrameImpl::userMediaClient() {
4317 if (!web_user_media_client_) 4327 if (!web_user_media_client_)
4318 InitializeUserMediaClient(); 4328 InitializeUserMediaClient();
(...skipping 2019 matching lines...) Expand 10 before | Expand all | Expand 10 after
6338 // event target. Potentially a Pepper plugin will receive the event. 6348 // event target. Potentially a Pepper plugin will receive the event.
6339 // In order to tell whether a plugin gets the last mouse event and which it 6349 // In order to tell whether a plugin gets the last mouse event and which it
6340 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6350 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6341 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6351 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6342 // |pepper_last_mouse_event_target_|. 6352 // |pepper_last_mouse_event_target_|.
6343 pepper_last_mouse_event_target_ = nullptr; 6353 pepper_last_mouse_event_target_ = nullptr;
6344 #endif 6354 #endif
6345 } 6355 }
6346 6356
6347 } // namespace content 6357 } // 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