| 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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 #if defined(ENABLE_MOJO_RENDERER) | 234 #if defined(ENABLE_MOJO_RENDERER) |
| 235 #include "media/mojo/services/mojo_renderer_factory.h" // nogncheck | 235 #include "media/mojo/services/mojo_renderer_factory.h" // nogncheck |
| 236 #else | 236 #else |
| 237 #include "media/renderers/default_renderer_factory.h" | 237 #include "media/renderers/default_renderer_factory.h" |
| 238 #endif | 238 #endif |
| 239 | 239 |
| 240 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER) | 240 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER) |
| 241 #include "media/mojo/services/mojo_decoder_factory.h" // nogncheck | 241 #include "media/mojo/services/mojo_decoder_factory.h" // nogncheck |
| 242 #endif | 242 #endif |
| 243 | 243 |
| 244 #if defined(ENABLE_WEBVR) | |
| 245 #include "content/renderer/vr/vr_dispatcher.h" | |
| 246 #endif | |
| 247 | |
| 248 using blink::WebCachePolicy; | 244 using blink::WebCachePolicy; |
| 249 using blink::WebContentDecryptionModule; | 245 using blink::WebContentDecryptionModule; |
| 250 using blink::WebContextMenuData; | 246 using blink::WebContextMenuData; |
| 251 using blink::WebCString; | 247 using blink::WebCString; |
| 252 using blink::WebData; | 248 using blink::WebData; |
| 253 using blink::WebDataSource; | 249 using blink::WebDataSource; |
| 254 using blink::WebDocument; | 250 using blink::WebDocument; |
| 255 using blink::WebDOMEvent; | 251 using blink::WebDOMEvent; |
| 256 using blink::WebDOMMessageEvent; | 252 using blink::WebDOMMessageEvent; |
| 257 using blink::WebElement; | 253 using blink::WebElement; |
| (...skipping 4026 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4284 // ChildThreadImpl::current() is null in some tests. | 4280 // ChildThreadImpl::current() is null in some tests. |
| 4285 if (!bluetooth_ && ChildThreadImpl::current()) { | 4281 if (!bluetooth_ && ChildThreadImpl::current()) { |
| 4286 bluetooth_.reset(new WebBluetoothImpl( | 4282 bluetooth_.reset(new WebBluetoothImpl( |
| 4287 GetServiceRegistry(), ChildThreadImpl::current()->thread_safe_sender(), | 4283 GetServiceRegistry(), ChildThreadImpl::current()->thread_safe_sender(), |
| 4288 routing_id_)); | 4284 routing_id_)); |
| 4289 } | 4285 } |
| 4290 | 4286 |
| 4291 return bluetooth_.get(); | 4287 return bluetooth_.get(); |
| 4292 } | 4288 } |
| 4293 | 4289 |
| 4294 #if defined(ENABLE_WEBVR) | |
| 4295 blink::WebVRClient* RenderFrameImpl::webVRClient() { | |
| 4296 if (!vr_dispatcher_) | |
| 4297 vr_dispatcher_.reset(new VRDispatcher(GetServiceRegistry())); | |
| 4298 | |
| 4299 return vr_dispatcher_.get(); | |
| 4300 } | |
| 4301 #endif | |
| 4302 | |
| 4303 void RenderFrameImpl::didSerializeDataForFrame( | 4290 void RenderFrameImpl::didSerializeDataForFrame( |
| 4304 const WebCString& data, | 4291 const WebCString& data, |
| 4305 WebFrameSerializerClient::FrameSerializationStatus status) { | 4292 WebFrameSerializerClient::FrameSerializationStatus status) { |
| 4306 bool end_of_data = status == WebFrameSerializerClient::CurrentFrameIsFinished; | 4293 bool end_of_data = status == WebFrameSerializerClient::CurrentFrameIsFinished; |
| 4307 Send(new FrameHostMsg_SerializedHtmlWithLocalLinksResponse( | 4294 Send(new FrameHostMsg_SerializedHtmlWithLocalLinksResponse( |
| 4308 routing_id_, data, end_of_data)); | 4295 routing_id_, data, end_of_data)); |
| 4309 } | 4296 } |
| 4310 | 4297 |
| 4311 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { | 4298 void RenderFrameImpl::AddObserver(RenderFrameObserver* observer) { |
| 4312 observers_.AddObserver(observer); | 4299 observers_.AddObserver(observer); |
| (...skipping 1723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6036 int match_count, | 6023 int match_count, |
| 6037 int ordinal, | 6024 int ordinal, |
| 6038 const WebRect& selection_rect, | 6025 const WebRect& selection_rect, |
| 6039 bool final_status_update) { | 6026 bool final_status_update) { |
| 6040 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6027 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
| 6041 selection_rect, ordinal, | 6028 selection_rect, ordinal, |
| 6042 final_status_update)); | 6029 final_status_update)); |
| 6043 } | 6030 } |
| 6044 | 6031 |
| 6045 } // namespace content | 6032 } // namespace content |
| OLD | NEW |