Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(376)

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2744963002: Introduce InterfaceEndpointClient(IEC), InterfaceEndpointHandle and (Closed)
Patch Set: Resolve Merge with new changes from master. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 #include "content/renderer/shared_worker/shared_worker_repository.h" 141 #include "content/renderer/shared_worker/shared_worker_repository.h"
142 #include "content/renderer/shared_worker/websharedworker_proxy.h" 142 #include "content/renderer/shared_worker/websharedworker_proxy.h"
143 #include "content/renderer/skia_benchmarking_extension.h" 143 #include "content/renderer/skia_benchmarking_extension.h"
144 #include "content/renderer/stats_collection_controller.h" 144 #include "content/renderer/stats_collection_controller.h"
145 #include "content/renderer/web_frame_utils.h" 145 #include "content/renderer/web_frame_utils.h"
146 #include "content/renderer/web_ui_extension.h" 146 #include "content/renderer/web_ui_extension.h"
147 #include "content/renderer/web_ui_extension_data.h" 147 #include "content/renderer/web_ui_extension_data.h"
148 #include "crypto/sha2.h" 148 #include "crypto/sha2.h"
149 #include "gin/modules/console.h" 149 #include "gin/modules/console.h"
150 #include "gin/modules/module_registry.h" 150 #include "gin/modules/module_registry.h"
151 #include "gin/modules/timer.h"
151 #include "media/audio/audio_output_device.h" 152 #include "media/audio/audio_output_device.h"
152 #include "media/base/audio_renderer_mixer_input.h" 153 #include "media/base/audio_renderer_mixer_input.h"
153 #include "media/base/cdm_factory.h" 154 #include "media/base/cdm_factory.h"
154 #include "media/base/decoder_factory.h" 155 #include "media/base/decoder_factory.h"
155 #include "media/base/media.h" 156 #include "media/base/media.h"
156 #include "media/base/media_log.h" 157 #include "media/base/media_log.h"
157 #include "media/base/media_switches.h" 158 #include "media/base/media_switches.h"
158 #include "media/blink/url_index.h" 159 #include "media/blink/url_index.h"
159 #include "media/blink/webencryptedmediaclient_impl.h" 160 #include "media/blink/webencryptedmediaclient_impl.h"
160 #include "media/blink/webmediaplayer_impl.h" 161 #include "media/blink/webmediaplayer_impl.h"
(...skipping 2458 matching lines...) Expand 10 before | Expand all | Expand 10 after
2619 v8::Isolate* isolate, 2620 v8::Isolate* isolate,
2620 v8::Local<v8::Context> context) { 2621 v8::Local<v8::Context> context) {
2621 gin::ModuleRegistry* registry = gin::ModuleRegistry::From(context); 2622 gin::ModuleRegistry* registry = gin::ModuleRegistry::From(context);
2622 if (registry->available_modules().count(mojo::edk::js::Core::kModuleName)) 2623 if (registry->available_modules().count(mojo::edk::js::Core::kModuleName))
2623 return; 2624 return;
2624 2625
2625 v8::HandleScope handle_scope(isolate); 2626 v8::HandleScope handle_scope(isolate);
2626 2627
2627 registry->AddBuiltinModule(isolate, gin::Console::kModuleName, 2628 registry->AddBuiltinModule(isolate, gin::Console::kModuleName,
2628 gin::Console::GetModule(isolate)); 2629 gin::Console::GetModule(isolate));
2630 registry->AddBuiltinModule(isolate, gin::TimerModule::kName,
2631 gin::TimerModule::GetModule(isolate));
2629 registry->AddBuiltinModule(isolate, mojo::edk::js::Core::kModuleName, 2632 registry->AddBuiltinModule(isolate, mojo::edk::js::Core::kModuleName,
2630 mojo::edk::js::Core::GetModule(isolate)); 2633 mojo::edk::js::Core::GetModule(isolate));
2631 registry->AddBuiltinModule(isolate, mojo::edk::js::Support::kModuleName, 2634 registry->AddBuiltinModule(isolate, mojo::edk::js::Support::kModuleName,
2632 mojo::edk::js::Support::GetModule(isolate)); 2635 mojo::edk::js::Support::GetModule(isolate));
2633 registry->AddBuiltinModule( 2636 registry->AddBuiltinModule(
2634 isolate, InterfaceProviderJsWrapper::kPerFrameModuleName, 2637 isolate, InterfaceProviderJsWrapper::kPerFrameModuleName,
2635 InterfaceProviderJsWrapper::Create( 2638 InterfaceProviderJsWrapper::Create(
2636 isolate, context, remote_interfaces_.get()) 2639 isolate, context, remote_interfaces_.get())
2637 .ToV8()); 2640 .ToV8());
2638 registry->AddBuiltinModule( 2641 registry->AddBuiltinModule(
(...skipping 4259 matching lines...) Expand 10 before | Expand all | Expand 10 after
6898 // event target. Potentially a Pepper plugin will receive the event. 6901 // event target. Potentially a Pepper plugin will receive the event.
6899 // In order to tell whether a plugin gets the last mouse event and which it 6902 // In order to tell whether a plugin gets the last mouse event and which it
6900 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6903 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6901 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6904 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6902 // |pepper_last_mouse_event_target_|. 6905 // |pepper_last_mouse_event_target_|.
6903 pepper_last_mouse_event_target_ = nullptr; 6906 pepper_last_mouse_event_target_ = nullptr;
6904 #endif 6907 #endif
6905 } 6908 }
6906 6909
6907 } // namespace content 6910 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698