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/shared_worker_repository.h" | 137 #include "content/renderer/shared_worker/shared_worker_repository.h" |
138 #include "content/renderer/shared_worker/websharedworker_proxy.h" | 138 #include "content/renderer/shared_worker/websharedworker_proxy.h" |
139 #include "content/renderer/skia_benchmarking_extension.h" | 139 #include "content/renderer/skia_benchmarking_extension.h" |
140 #include "content/renderer/stats_collection_controller.h" | 140 #include "content/renderer/stats_collection_controller.h" |
141 #include "content/renderer/web_frame_utils.h" | 141 #include "content/renderer/web_frame_utils.h" |
142 #include "content/renderer/web_ui_extension.h" | 142 #include "content/renderer/web_ui_extension.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 2460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2614 } | 2615 } |
2615 | 2616 |
2616 void RenderFrameImpl::EnsureMojoBuiltinsAreAvailable( | 2617 void RenderFrameImpl::EnsureMojoBuiltinsAreAvailable( |
2617 v8::Isolate* isolate, | 2618 v8::Isolate* isolate, |
2618 v8::Local<v8::Context> context) { | 2619 v8::Local<v8::Context> context) { |
2619 gin::ModuleRegistry* registry = gin::ModuleRegistry::From(context); | 2620 gin::ModuleRegistry* registry = gin::ModuleRegistry::From(context); |
2620 if (registry->available_modules().count(mojo::edk::js::Core::kModuleName)) | 2621 if (registry->available_modules().count(mojo::edk::js::Core::kModuleName)) |
2621 return; | 2622 return; |
2622 | 2623 |
2623 v8::HandleScope handle_scope(isolate); | 2624 v8::HandleScope handle_scope(isolate); |
| 2625 |
| 2626 registry->AddBuiltinModule(isolate, gin::Console::kModuleName, |
| 2627 gin::Console::GetModule(isolate)); |
2624 registry->AddBuiltinModule(isolate, mojo::edk::js::Core::kModuleName, | 2628 registry->AddBuiltinModule(isolate, mojo::edk::js::Core::kModuleName, |
2625 mojo::edk::js::Core::GetModule(isolate)); | 2629 mojo::edk::js::Core::GetModule(isolate)); |
2626 registry->AddBuiltinModule(isolate, mojo::edk::js::Support::kModuleName, | 2630 registry->AddBuiltinModule(isolate, mojo::edk::js::Support::kModuleName, |
2627 mojo::edk::js::Support::GetModule(isolate)); | 2631 mojo::edk::js::Support::GetModule(isolate)); |
2628 registry->AddBuiltinModule( | 2632 registry->AddBuiltinModule( |
2629 isolate, InterfaceProviderJsWrapper::kPerFrameModuleName, | 2633 isolate, InterfaceProviderJsWrapper::kPerFrameModuleName, |
2630 InterfaceProviderJsWrapper::Create( | 2634 InterfaceProviderJsWrapper::Create( |
2631 isolate, context, remote_interfaces_.get()) | 2635 isolate, context, remote_interfaces_.get()) |
2632 .ToV8()); | 2636 .ToV8()); |
2633 registry->AddBuiltinModule( | 2637 registry->AddBuiltinModule( |
(...skipping 4161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6795 // event target. Potentially a Pepper plugin will receive the event. | 6799 // event target. Potentially a Pepper plugin will receive the event. |
6796 // In order to tell whether a plugin gets the last mouse event and which it | 6800 // In order to tell whether a plugin gets the last mouse event and which it |
6797 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6801 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
6798 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6802 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
6799 // |pepper_last_mouse_event_target_|. | 6803 // |pepper_last_mouse_event_target_|. |
6800 pepper_last_mouse_event_target_ = nullptr; | 6804 pepper_last_mouse_event_target_ = nullptr; |
6801 #endif | 6805 #endif |
6802 } | 6806 } |
6803 | 6807 |
6804 } // namespace content | 6808 } // namespace content |
OLD | NEW |