| 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 #include "media/base/cdm_factory.h" | 153 #include "media/base/cdm_factory.h" |
| 154 #include "media/base/decoder_factory.h" | 154 #include "media/base/decoder_factory.h" |
| 155 #include "media/base/media.h" | 155 #include "media/base/media.h" |
| 156 #include "media/base/media_log.h" | 156 #include "media/base/media_log.h" |
| 157 #include "media/base/media_switches.h" | 157 #include "media/base/media_switches.h" |
| 158 #include "media/blink/url_index.h" | 158 #include "media/blink/url_index.h" |
| 159 #include "media/blink/webencryptedmediaclient_impl.h" | 159 #include "media/blink/webencryptedmediaclient_impl.h" |
| 160 #include "media/blink/webmediaplayer_impl.h" | 160 #include "media/blink/webmediaplayer_impl.h" |
| 161 #include "media/media_features.h" | 161 #include "media/media_features.h" |
| 162 #include "media/renderers/gpu_video_accelerator_factories.h" | 162 #include "media/renderers/gpu_video_accelerator_factories.h" |
| 163 #include "mojo/edk/js/core.h" | |
| 164 #include "mojo/edk/js/support.h" | |
| 165 #include "net/base/data_url.h" | 163 #include "net/base/data_url.h" |
| 166 #include "net/base/load_flags.h" | 164 #include "net/base/load_flags.h" |
| 167 #include "net/base/net_errors.h" | 165 #include "net/base/net_errors.h" |
| 168 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" | 166 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
| 169 #include "net/http/http_util.h" | 167 #include "net/http/http_util.h" |
| 170 #include "ppapi/features/features.h" | 168 #include "ppapi/features/features.h" |
| 171 #include "services/service_manager/public/cpp/interface_provider.h" | 169 #include "services/service_manager/public/cpp/interface_provider.h" |
| 172 #include "services/service_manager/public/cpp/interface_registry.h" | 170 #include "services/service_manager/public/cpp/interface_registry.h" |
| 173 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h" | 171 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h" |
| 174 #include "storage/common/data_element.h" | 172 #include "storage/common/data_element.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 193 #include "third_party/WebKit/public/web/WebDocument.h" | 191 #include "third_party/WebKit/public/web/WebDocument.h" |
| 194 #include "third_party/WebKit/public/web/WebFindOptions.h" | 192 #include "third_party/WebKit/public/web/WebFindOptions.h" |
| 195 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h" | 193 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h" |
| 196 #include "third_party/WebKit/public/web/WebFrameSerializer.h" | 194 #include "third_party/WebKit/public/web/WebFrameSerializer.h" |
| 197 #include "third_party/WebKit/public/web/WebFrameSerializerCacheControlPolicy.h" | 195 #include "third_party/WebKit/public/web/WebFrameSerializerCacheControlPolicy.h" |
| 198 #include "third_party/WebKit/public/web/WebFrameWidget.h" | 196 #include "third_party/WebKit/public/web/WebFrameWidget.h" |
| 199 #include "third_party/WebKit/public/web/WebInputMethodController.h" | 197 #include "third_party/WebKit/public/web/WebInputMethodController.h" |
| 200 #include "third_party/WebKit/public/web/WebKit.h" | 198 #include "third_party/WebKit/public/web/WebKit.h" |
| 201 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 199 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
| 202 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" | 200 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" |
| 201 #include "third_party/WebKit/public/web/WebMojoBindings.h" |
| 203 #include "third_party/WebKit/public/web/WebNavigationPolicy.h" | 202 #include "third_party/WebKit/public/web/WebNavigationPolicy.h" |
| 204 #include "third_party/WebKit/public/web/WebPlugin.h" | 203 #include "third_party/WebKit/public/web/WebPlugin.h" |
| 205 #include "third_party/WebKit/public/web/WebPluginContainer.h" | 204 #include "third_party/WebKit/public/web/WebPluginContainer.h" |
| 206 #include "third_party/WebKit/public/web/WebPluginDocument.h" | 205 #include "third_party/WebKit/public/web/WebPluginDocument.h" |
| 207 #include "third_party/WebKit/public/web/WebPluginParams.h" | 206 #include "third_party/WebKit/public/web/WebPluginParams.h" |
| 208 #include "third_party/WebKit/public/web/WebRange.h" | 207 #include "third_party/WebKit/public/web/WebRange.h" |
| 209 #include "third_party/WebKit/public/web/WebScopedUserGesture.h" | 208 #include "third_party/WebKit/public/web/WebScopedUserGesture.h" |
| 210 #include "third_party/WebKit/public/web/WebScriptSource.h" | 209 #include "third_party/WebKit/public/web/WebScriptSource.h" |
| 211 #include "third_party/WebKit/public/web/WebSearchableFormData.h" | 210 #include "third_party/WebKit/public/web/WebSearchableFormData.h" |
| 212 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" | 211 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" |
| (...skipping 2384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2597 size_t offset, | 2596 size_t offset, |
| 2598 const gfx::Range& range) { | 2597 const gfx::Range& range) { |
| 2599 Send(new FrameHostMsg_SelectionChanged(routing_id_, selection_text, | 2598 Send(new FrameHostMsg_SelectionChanged(routing_id_, selection_text, |
| 2600 static_cast<uint32_t>(offset), range)); | 2599 static_cast<uint32_t>(offset), range)); |
| 2601 } | 2600 } |
| 2602 | 2601 |
| 2603 void RenderFrameImpl::EnsureMojoBuiltinsAreAvailable( | 2602 void RenderFrameImpl::EnsureMojoBuiltinsAreAvailable( |
| 2604 v8::Isolate* isolate, | 2603 v8::Isolate* isolate, |
| 2605 v8::Local<v8::Context> context) { | 2604 v8::Local<v8::Context> context) { |
| 2606 gin::ModuleRegistry* registry = gin::ModuleRegistry::From(context); | 2605 gin::ModuleRegistry* registry = gin::ModuleRegistry::From(context); |
| 2607 if (registry->available_modules().count(mojo::edk::js::Core::kModuleName)) | 2606 if (registry->available_modules().count(gin::Console::kModuleName)) |
| 2608 return; | 2607 return; |
| 2609 | 2608 |
| 2610 v8::HandleScope handle_scope(isolate); | 2609 v8::HandleScope handle_scope(isolate); |
| 2611 | |
| 2612 registry->AddBuiltinModule(isolate, gin::Console::kModuleName, | 2610 registry->AddBuiltinModule(isolate, gin::Console::kModuleName, |
| 2613 gin::Console::GetModule(isolate)); | 2611 gin::Console::GetModule(isolate)); |
| 2614 registry->AddBuiltinModule(isolate, mojo::edk::js::Core::kModuleName, | |
| 2615 mojo::edk::js::Core::GetModule(isolate)); | |
| 2616 registry->AddBuiltinModule(isolate, mojo::edk::js::Support::kModuleName, | |
| 2617 mojo::edk::js::Support::GetModule(isolate)); | |
| 2618 registry->AddBuiltinModule( | 2612 registry->AddBuiltinModule( |
| 2619 isolate, InterfaceProviderJsWrapper::kPerFrameModuleName, | 2613 isolate, InterfaceProviderJsWrapper::kPerFrameModuleName, |
| 2620 InterfaceProviderJsWrapper::Create( | 2614 InterfaceProviderJsWrapper::Create( |
| 2621 isolate, context, remote_interfaces_.get()) | 2615 isolate, context, remote_interfaces_.get()) |
| 2622 .ToV8()); | 2616 .ToV8()); |
| 2623 registry->AddBuiltinModule( | 2617 registry->AddBuiltinModule( |
| 2624 isolate, InterfaceProviderJsWrapper::kPerProcessModuleName, | 2618 isolate, InterfaceProviderJsWrapper::kPerProcessModuleName, |
| 2625 InterfaceProviderJsWrapper::Create( | 2619 InterfaceProviderJsWrapper::Create( |
| 2626 isolate, context, RenderThread::Get()->GetRemoteInterfaces()) | 2620 isolate, context, RenderThread::Get()->GetRemoteInterfaces()) |
| 2627 .ToV8()); | 2621 .ToV8()); |
| (...skipping 4221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6849 // event target. Potentially a Pepper plugin will receive the event. | 6843 // event target. Potentially a Pepper plugin will receive the event. |
| 6850 // In order to tell whether a plugin gets the last mouse event and which it | 6844 // In order to tell whether a plugin gets the last mouse event and which it |
| 6851 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6845 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6852 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6846 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6853 // |pepper_last_mouse_event_target_|. | 6847 // |pepper_last_mouse_event_target_|. |
| 6854 pepper_last_mouse_event_target_ = nullptr; | 6848 pepper_last_mouse_event_target_ = nullptr; |
| 6855 #endif | 6849 #endif |
| 6856 } | 6850 } |
| 6857 | 6851 |
| 6858 } // namespace content | 6852 } // namespace content |
| OLD | NEW |