OLD | NEW |
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 22 matching lines...) Expand all Loading... |
33 #include "components/scheduler/renderer/renderer_scheduler.h" | 33 #include "components/scheduler/renderer/renderer_scheduler.h" |
34 #include "content/child/appcache/appcache_dispatcher.h" | 34 #include "content/child/appcache/appcache_dispatcher.h" |
35 #include "content/child/permissions/permission_dispatcher.h" | 35 #include "content/child/permissions/permission_dispatcher.h" |
36 #include "content/child/plugin_messages.h" | 36 #include "content/child/plugin_messages.h" |
37 #include "content/child/quota_dispatcher.h" | 37 #include "content/child/quota_dispatcher.h" |
38 #include "content/child/request_extra_data.h" | 38 #include "content/child/request_extra_data.h" |
39 #include "content/child/service_worker/service_worker_handle_reference.h" | 39 #include "content/child/service_worker/service_worker_handle_reference.h" |
40 #include "content/child/service_worker/service_worker_network_provider.h" | 40 #include "content/child/service_worker/service_worker_network_provider.h" |
41 #include "content/child/service_worker/service_worker_provider_context.h" | 41 #include "content/child/service_worker/service_worker_provider_context.h" |
42 #include "content/child/service_worker/web_service_worker_provider_impl.h" | 42 #include "content/child/service_worker/web_service_worker_provider_impl.h" |
| 43 #include "content/child/thread_safe_sender.h" |
43 #include "content/child/v8_value_converter_impl.h" | 44 #include "content/child/v8_value_converter_impl.h" |
44 #include "content/child/web_url_loader_impl.h" | 45 #include "content/child/web_url_loader_impl.h" |
45 #include "content/child/web_url_request_util.h" | 46 #include "content/child/web_url_request_util.h" |
46 #include "content/child/webmessageportchannel_impl.h" | 47 #include "content/child/webmessageportchannel_impl.h" |
47 #include "content/child/websocket_bridge.h" | 48 #include "content/child/websocket_bridge.h" |
48 #include "content/child/weburlresponse_extradata_impl.h" | 49 #include "content/child/weburlresponse_extradata_impl.h" |
49 #include "content/common/accessibility_messages.h" | 50 #include "content/common/accessibility_messages.h" |
50 #include "content/common/clipboard_messages.h" | 51 #include "content/common/clipboard_messages.h" |
51 #include "content/common/frame_messages.h" | 52 #include "content/common/frame_messages.h" |
52 #include "content/common/frame_replication_state.h" | 53 #include "content/common/frame_replication_state.h" |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 #include "third_party/WebKit/public/platform/WebString.h" | 151 #include "third_party/WebKit/public/platform/WebString.h" |
151 #include "third_party/WebKit/public/platform/WebURL.h" | 152 #include "third_party/WebKit/public/platform/WebURL.h" |
152 #include "third_party/WebKit/public/platform/WebURLError.h" | 153 #include "third_party/WebKit/public/platform/WebURLError.h" |
153 #include "third_party/WebKit/public/platform/WebURLResponse.h" | 154 #include "third_party/WebKit/public/platform/WebURLResponse.h" |
154 #include "third_party/WebKit/public/platform/WebVector.h" | 155 #include "third_party/WebKit/public/platform/WebVector.h" |
155 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBClient.h" | 156 #include "third_party/WebKit/public/platform/modules/webusb/WebUSBClient.h" |
156 #include "third_party/WebKit/public/web/WebColorSuggestion.h" | 157 #include "third_party/WebKit/public/web/WebColorSuggestion.h" |
157 #include "third_party/WebKit/public/web/WebDocument.h" | 158 #include "third_party/WebKit/public/web/WebDocument.h" |
158 #include "third_party/WebKit/public/web/WebFrameSerializer.h" | 159 #include "third_party/WebKit/public/web/WebFrameSerializer.h" |
159 #include "third_party/WebKit/public/web/WebFrameWidget.h" | 160 #include "third_party/WebKit/public/web/WebFrameWidget.h" |
| 161 #include "third_party/WebKit/public/web/WebFramelet.h" |
| 162 #include "third_party/WebKit/public/web/WebFrameletClient.h" |
160 #include "third_party/WebKit/public/web/WebKit.h" | 163 #include "third_party/WebKit/public/web/WebKit.h" |
161 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 164 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
162 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" | 165 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" |
163 #include "third_party/WebKit/public/web/WebNavigationPolicy.h" | 166 #include "third_party/WebKit/public/web/WebNavigationPolicy.h" |
164 #include "third_party/WebKit/public/web/WebPlugin.h" | 167 #include "third_party/WebKit/public/web/WebPlugin.h" |
165 #include "third_party/WebKit/public/web/WebPluginParams.h" | 168 #include "third_party/WebKit/public/web/WebPluginParams.h" |
166 #include "third_party/WebKit/public/web/WebRange.h" | 169 #include "third_party/WebKit/public/web/WebRange.h" |
167 #include "third_party/WebKit/public/web/WebScopedUserGesture.h" | 170 #include "third_party/WebKit/public/web/WebScopedUserGesture.h" |
168 #include "third_party/WebKit/public/web/WebScriptSource.h" | 171 #include "third_party/WebKit/public/web/WebScriptSource.h" |
169 #include "third_party/WebKit/public/web/WebSearchableFormData.h" | 172 #include "third_party/WebKit/public/web/WebSearchableFormData.h" |
(...skipping 2425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2595 child_render_frame->BindToWebFrame(web_frame); | 2598 child_render_frame->BindToWebFrame(web_frame); |
2596 | 2599 |
2597 // Add the frame to the frame tree and initialize it. | 2600 // Add the frame to the frame tree and initialize it. |
2598 parent->appendChild(web_frame); | 2601 parent->appendChild(web_frame); |
2599 child_render_frame->in_frame_tree_ = true; | 2602 child_render_frame->in_frame_tree_ = true; |
2600 child_render_frame->Initialize(); | 2603 child_render_frame->Initialize(); |
2601 | 2604 |
2602 return web_frame; | 2605 return web_frame; |
2603 } | 2606 } |
2604 | 2607 |
| 2608 blink::WebFramelet* RenderFrameImpl::createFramelet(const blink::WebURL& url) { |
| 2609 blink::WebFrameletClient* client = |
| 2610 GetContentClient()->renderer()->CreateFramelet( |
| 2611 this, GURL(url), RenderThreadImpl::current()->thread_safe_sender()); |
| 2612 return blink::WebFramelet::create(client); |
| 2613 } |
| 2614 |
2605 void RenderFrameImpl::didChangeOpener(blink::WebFrame* opener) { | 2615 void RenderFrameImpl::didChangeOpener(blink::WebFrame* opener) { |
2606 // Only active frames are able to disown their opener. | 2616 // Only active frames are able to disown their opener. |
2607 if (!opener && is_swapped_out_) | 2617 if (!opener && is_swapped_out_) |
2608 return; | 2618 return; |
2609 | 2619 |
2610 // Only a local frame should be able to update another frame's opener. | 2620 // Only a local frame should be able to update another frame's opener. |
2611 DCHECK(!opener || opener->isWebLocalFrame()); | 2621 DCHECK(!opener || opener->isWebLocalFrame()); |
2612 | 2622 |
2613 int opener_routing_id = opener ? | 2623 int opener_routing_id = opener ? |
2614 RenderFrameImpl::FromWebFrame(opener->toWebLocalFrame())->GetRoutingID() : | 2624 RenderFrameImpl::FromWebFrame(opener->toWebLocalFrame())->GetRoutingID() : |
(...skipping 3152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5767 media::ConvertToSwitchOutputDeviceCB(web_callbacks); | 5777 media::ConvertToSwitchOutputDeviceCB(web_callbacks); |
5768 scoped_refptr<media::AudioOutputDevice> device = | 5778 scoped_refptr<media::AudioOutputDevice> device = |
5769 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), | 5779 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), |
5770 security_origin); | 5780 security_origin); |
5771 media::OutputDeviceStatus status = device->GetDeviceStatus(); | 5781 media::OutputDeviceStatus status = device->GetDeviceStatus(); |
5772 device->Stop(); | 5782 device->Stop(); |
5773 callback.Run(status); | 5783 callback.Run(status); |
5774 } | 5784 } |
5775 | 5785 |
5776 } // namespace content | 5786 } // namespace content |
OLD | NEW |