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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 #include "content/renderer/renderer_webcolorchooser_impl.h" | 134 #include "content/renderer/renderer_webcolorchooser_impl.h" |
135 #include "content/renderer/savable_resources.h" | 135 #include "content/renderer/savable_resources.h" |
136 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h" | 136 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h" |
137 #include "content/renderer/shared_worker_repository.h" | 137 #include "content/renderer/shared_worker_repository.h" |
138 #include "content/renderer/skia_benchmarking_extension.h" | 138 #include "content/renderer/skia_benchmarking_extension.h" |
139 #include "content/renderer/stats_collection_controller.h" | 139 #include "content/renderer/stats_collection_controller.h" |
140 #include "content/renderer/web_frame_utils.h" | 140 #include "content/renderer/web_frame_utils.h" |
141 #include "content/renderer/web_ui_extension.h" | 141 #include "content/renderer/web_ui_extension.h" |
142 #include "content/renderer/websharedworker_proxy.h" | 142 #include "content/renderer/websharedworker_proxy.h" |
143 #include "crypto/sha2.h" | 143 #include "crypto/sha2.h" |
| 144 #include "gin/modules/console.h" |
144 #include "gin/modules/module_registry.h" | 145 #include "gin/modules/module_registry.h" |
145 #include "media/audio/audio_output_device.h" | 146 #include "media/audio/audio_output_device.h" |
146 #include "media/base/audio_renderer_mixer_input.h" | 147 #include "media/base/audio_renderer_mixer_input.h" |
147 #include "media/base/cdm_factory.h" | 148 #include "media/base/cdm_factory.h" |
148 #include "media/base/decoder_factory.h" | 149 #include "media/base/decoder_factory.h" |
149 #include "media/base/media.h" | 150 #include "media/base/media.h" |
150 #include "media/base/media_log.h" | 151 #include "media/base/media_log.h" |
151 #include "media/base/media_switches.h" | 152 #include "media/base/media_switches.h" |
152 #include "media/blink/url_index.h" | 153 #include "media/blink/url_index.h" |
153 #include "media/blink/webencryptedmediaclient_impl.h" | 154 #include "media/blink/webencryptedmediaclient_impl.h" |
(...skipping 2455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2609 } | 2610 } |
2610 | 2611 |
2611 void RenderFrameImpl::EnsureMojoBuiltinsAreAvailable( | 2612 void RenderFrameImpl::EnsureMojoBuiltinsAreAvailable( |
2612 v8::Isolate* isolate, | 2613 v8::Isolate* isolate, |
2613 v8::Local<v8::Context> context) { | 2614 v8::Local<v8::Context> context) { |
2614 gin::ModuleRegistry* registry = gin::ModuleRegistry::From(context); | 2615 gin::ModuleRegistry* registry = gin::ModuleRegistry::From(context); |
2615 if (registry->available_modules().count(mojo::edk::js::Core::kModuleName)) | 2616 if (registry->available_modules().count(mojo::edk::js::Core::kModuleName)) |
2616 return; | 2617 return; |
2617 | 2618 |
2618 v8::HandleScope handle_scope(isolate); | 2619 v8::HandleScope handle_scope(isolate); |
| 2620 |
| 2621 registry->AddBuiltinModule(isolate, gin::Console::kModuleName, |
| 2622 gin::Console::GetModule(isolate)); |
2619 registry->AddBuiltinModule(isolate, mojo::edk::js::Core::kModuleName, | 2623 registry->AddBuiltinModule(isolate, mojo::edk::js::Core::kModuleName, |
2620 mojo::edk::js::Core::GetModule(isolate)); | 2624 mojo::edk::js::Core::GetModule(isolate)); |
2621 registry->AddBuiltinModule(isolate, mojo::edk::js::Support::kModuleName, | 2625 registry->AddBuiltinModule(isolate, mojo::edk::js::Support::kModuleName, |
2622 mojo::edk::js::Support::GetModule(isolate)); | 2626 mojo::edk::js::Support::GetModule(isolate)); |
2623 registry->AddBuiltinModule( | 2627 registry->AddBuiltinModule( |
2624 isolate, InterfaceProviderJsWrapper::kPerFrameModuleName, | 2628 isolate, InterfaceProviderJsWrapper::kPerFrameModuleName, |
2625 InterfaceProviderJsWrapper::Create( | 2629 InterfaceProviderJsWrapper::Create( |
2626 isolate, context, remote_interfaces_.get()) | 2630 isolate, context, remote_interfaces_.get()) |
2627 .ToV8()); | 2631 .ToV8()); |
2628 registry->AddBuiltinModule( | 2632 registry->AddBuiltinModule( |
(...skipping 4126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6755 // event target. Potentially a Pepper plugin will receive the event. | 6759 // event target. Potentially a Pepper plugin will receive the event. |
6756 // In order to tell whether a plugin gets the last mouse event and which it | 6760 // In order to tell whether a plugin gets the last mouse event and which it |
6757 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6761 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
6758 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6762 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
6759 // |pepper_last_mouse_event_target_|. | 6763 // |pepper_last_mouse_event_target_|. |
6760 pepper_last_mouse_event_target_ = nullptr; | 6764 pepper_last_mouse_event_target_ = nullptr; |
6761 #endif | 6765 #endif |
6762 } | 6766 } |
6763 | 6767 |
6764 } // namespace content | 6768 } // namespace content |
OLD | NEW |