| 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 #include "content/renderer/media/audio_device_factory.h" | 108 #include "content/renderer/media/audio_device_factory.h" |
| 109 #include "content/renderer/media/media_permission_dispatcher.h" | 109 #include "content/renderer/media/media_permission_dispatcher.h" |
| 110 #include "content/renderer/media/media_stream_dispatcher.h" | 110 #include "content/renderer/media/media_stream_dispatcher.h" |
| 111 #include "content/renderer/media/media_stream_renderer_factory_impl.h" | 111 #include "content/renderer/media/media_stream_renderer_factory_impl.h" |
| 112 #include "content/renderer/media/render_media_log.h" | 112 #include "content/renderer/media/render_media_log.h" |
| 113 #include "content/renderer/media/renderer_webmediaplayer_delegate.h" | 113 #include "content/renderer/media/renderer_webmediaplayer_delegate.h" |
| 114 #include "content/renderer/media/user_media_client_impl.h" | 114 #include "content/renderer/media/user_media_client_impl.h" |
| 115 #include "content/renderer/media/web_media_element_source_utils.h" | 115 #include "content/renderer/media/web_media_element_source_utils.h" |
| 116 #include "content/renderer/media/webmediaplayer_ms.h" | 116 #include "content/renderer/media/webmediaplayer_ms.h" |
| 117 #include "content/renderer/mojo/interface_provider_js_wrapper.h" | 117 #include "content/renderer/mojo/interface_provider_js_wrapper.h" |
| 118 #include "content/renderer/mojo/interface_registry_js_wrapper.h" |
| 118 #include "content/renderer/mojo_bindings_controller.h" | 119 #include "content/renderer/mojo_bindings_controller.h" |
| 119 #include "content/renderer/navigation_state_impl.h" | 120 #include "content/renderer/navigation_state_impl.h" |
| 120 #include "content/renderer/pepper/pepper_audio_controller.h" | 121 #include "content/renderer/pepper/pepper_audio_controller.h" |
| 121 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" | 122 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" |
| 122 #include "content/renderer/presentation/presentation_dispatcher.h" | 123 #include "content/renderer/presentation/presentation_dispatcher.h" |
| 123 #include "content/renderer/push_messaging/push_messaging_dispatcher.h" | 124 #include "content/renderer/push_messaging/push_messaging_dispatcher.h" |
| 124 #include "content/renderer/render_frame_proxy.h" | 125 #include "content/renderer/render_frame_proxy.h" |
| 125 #include "content/renderer/render_process.h" | 126 #include "content/renderer/render_process.h" |
| 126 #include "content/renderer/render_thread_impl.h" | 127 #include "content/renderer/render_thread_impl.h" |
| 127 #include "content/renderer/render_view_impl.h" | 128 #include "content/renderer/render_view_impl.h" |
| (...skipping 2430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2558 registry->AddBuiltinModule( | 2559 registry->AddBuiltinModule( |
| 2559 isolate, InterfaceProviderJsWrapper::kPerFrameModuleName, | 2560 isolate, InterfaceProviderJsWrapper::kPerFrameModuleName, |
| 2560 InterfaceProviderJsWrapper::Create( | 2561 InterfaceProviderJsWrapper::Create( |
| 2561 isolate, context, remote_interfaces_.get()) | 2562 isolate, context, remote_interfaces_.get()) |
| 2562 .ToV8()); | 2563 .ToV8()); |
| 2563 registry->AddBuiltinModule( | 2564 registry->AddBuiltinModule( |
| 2564 isolate, InterfaceProviderJsWrapper::kPerProcessModuleName, | 2565 isolate, InterfaceProviderJsWrapper::kPerProcessModuleName, |
| 2565 InterfaceProviderJsWrapper::Create( | 2566 InterfaceProviderJsWrapper::Create( |
| 2566 isolate, context, RenderThread::Get()->GetRemoteInterfaces()) | 2567 isolate, context, RenderThread::Get()->GetRemoteInterfaces()) |
| 2567 .ToV8()); | 2568 .ToV8()); |
| 2569 registry->AddBuiltinModule(isolate, |
| 2570 InterfaceRegistryJsWrapper::kPerFrameModuleName, |
| 2571 InterfaceRegistryJsWrapper::Create( |
| 2572 isolate, context, interface_registry_.get()) |
| 2573 .ToV8()); |
| 2574 registry->AddBuiltinModule( |
| 2575 isolate, InterfaceRegistryJsWrapper::kPerProcessModuleName, |
| 2576 InterfaceRegistryJsWrapper::Create( |
| 2577 isolate, context, RenderThread::Get()->GetInterfaceRegistry()) |
| 2578 .ToV8()); |
| 2568 } | 2579 } |
| 2569 | 2580 |
| 2570 void RenderFrameImpl::AddMessageToConsole(ConsoleMessageLevel level, | 2581 void RenderFrameImpl::AddMessageToConsole(ConsoleMessageLevel level, |
| 2571 const std::string& message) { | 2582 const std::string& message) { |
| 2572 blink::WebConsoleMessage::Level target_level = | 2583 blink::WebConsoleMessage::Level target_level = |
| 2573 blink::WebConsoleMessage::LevelLog; | 2584 blink::WebConsoleMessage::LevelLog; |
| 2574 switch (level) { | 2585 switch (level) { |
| 2575 case CONSOLE_MESSAGE_LEVEL_DEBUG: | 2586 case CONSOLE_MESSAGE_LEVEL_DEBUG: |
| 2576 target_level = blink::WebConsoleMessage::LevelDebug; | 2587 target_level = blink::WebConsoleMessage::LevelDebug; |
| 2577 break; | 2588 break; |
| (...skipping 3906 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6484 // event target. Potentially a Pepper plugin will receive the event. | 6495 // event target. Potentially a Pepper plugin will receive the event. |
| 6485 // In order to tell whether a plugin gets the last mouse event and which it | 6496 // In order to tell whether a plugin gets the last mouse event and which it |
| 6486 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6497 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6487 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6498 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6488 // |pepper_last_mouse_event_target_|. | 6499 // |pepper_last_mouse_event_target_|. |
| 6489 pepper_last_mouse_event_target_ = nullptr; | 6500 pepper_last_mouse_event_target_ = nullptr; |
| 6490 #endif | 6501 #endif |
| 6491 } | 6502 } |
| 6492 | 6503 |
| 6493 } // namespace content | 6504 } // namespace content |
| OLD | NEW |