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

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

Issue 2643063002: Refactor Blink's ServiceConnector and add ability to mock in layout tests (Closed)
Patch Set: Rebase Created 3 years, 10 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 #include "content/renderer/media/audio_device_factory.h" 110 #include "content/renderer/media/audio_device_factory.h"
111 #include "content/renderer/media/media_devices_listener_impl.h" 111 #include "content/renderer/media/media_devices_listener_impl.h"
112 #include "content/renderer/media/media_permission_dispatcher.h" 112 #include "content/renderer/media/media_permission_dispatcher.h"
113 #include "content/renderer/media/media_stream_dispatcher.h" 113 #include "content/renderer/media/media_stream_dispatcher.h"
114 #include "content/renderer/media/media_stream_renderer_factory_impl.h" 114 #include "content/renderer/media/media_stream_renderer_factory_impl.h"
115 #include "content/renderer/media/render_media_log.h" 115 #include "content/renderer/media/render_media_log.h"
116 #include "content/renderer/media/renderer_webmediaplayer_delegate.h" 116 #include "content/renderer/media/renderer_webmediaplayer_delegate.h"
117 #include "content/renderer/media/user_media_client_impl.h" 117 #include "content/renderer/media/user_media_client_impl.h"
118 #include "content/renderer/media/web_media_element_source_utils.h" 118 #include "content/renderer/media/web_media_element_source_utils.h"
119 #include "content/renderer/media/webmediaplayer_ms.h" 119 #include "content/renderer/media/webmediaplayer_ms.h"
120 #include "content/renderer/mojo/blink_connector_impl.h"
121 #include "content/renderer/mojo/blink_connector_js_wrapper.h"
120 #include "content/renderer/mojo/blink_interface_registry_impl.h" 122 #include "content/renderer/mojo/blink_interface_registry_impl.h"
121 #include "content/renderer/mojo/interface_provider_js_wrapper.h" 123 #include "content/renderer/mojo/interface_provider_js_wrapper.h"
122 #include "content/renderer/mojo_bindings_controller.h" 124 #include "content/renderer/mojo_bindings_controller.h"
123 #include "content/renderer/navigation_state_impl.h" 125 #include "content/renderer/navigation_state_impl.h"
124 #include "content/renderer/pepper/pepper_audio_controller.h" 126 #include "content/renderer/pepper/pepper_audio_controller.h"
125 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" 127 #include "content/renderer/pepper/plugin_instance_throttler_impl.h"
126 #include "content/renderer/presentation/presentation_dispatcher.h" 128 #include "content/renderer/presentation/presentation_dispatcher.h"
127 #include "content/renderer/push_messaging/push_messaging_dispatcher.h" 129 #include "content/renderer/push_messaging/push_messaging_dispatcher.h"
128 #include "content/renderer/render_frame_proxy.h" 130 #include "content/renderer/render_frame_proxy.h"
129 #include "content/renderer/render_process.h" 131 #include "content/renderer/render_process.h"
130 #include "content/renderer/render_thread_impl.h" 132 #include "content/renderer/render_thread_impl.h"
131 #include "content/renderer/render_view_impl.h" 133 #include "content/renderer/render_view_impl.h"
132 #include "content/renderer/render_widget_fullscreen_pepper.h" 134 #include "content/renderer/render_widget_fullscreen_pepper.h"
135 #include "content/renderer/renderer_blink_platform_impl.h"
133 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 136 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
134 #include "content/renderer/renderer_webcolorchooser_impl.h" 137 #include "content/renderer/renderer_webcolorchooser_impl.h"
135 #include "content/renderer/savable_resources.h" 138 #include "content/renderer/savable_resources.h"
136 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h" 139 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h"
137 #include "content/renderer/shared_worker/shared_worker_repository.h" 140 #include "content/renderer/shared_worker/shared_worker_repository.h"
138 #include "content/renderer/shared_worker/websharedworker_proxy.h" 141 #include "content/renderer/shared_worker/websharedworker_proxy.h"
139 #include "content/renderer/skia_benchmarking_extension.h" 142 #include "content/renderer/skia_benchmarking_extension.h"
140 #include "content/renderer/stats_collection_controller.h" 143 #include "content/renderer/stats_collection_controller.h"
141 #include "content/renderer/web_frame_utils.h" 144 #include "content/renderer/web_frame_utils.h"
142 #include "content/renderer/web_ui_extension.h" 145 #include "content/renderer/web_ui_extension.h"
(...skipping 2491 matching lines...) Expand 10 before | Expand all | Expand 10 after
2634 registry->AddBuiltinModule( 2637 registry->AddBuiltinModule(
2635 isolate, InterfaceProviderJsWrapper::kPerFrameModuleName, 2638 isolate, InterfaceProviderJsWrapper::kPerFrameModuleName,
2636 InterfaceProviderJsWrapper::Create( 2639 InterfaceProviderJsWrapper::Create(
2637 isolate, context, remote_interfaces_.get()) 2640 isolate, context, remote_interfaces_.get())
2638 .ToV8()); 2641 .ToV8());
2639 registry->AddBuiltinModule( 2642 registry->AddBuiltinModule(
2640 isolate, InterfaceProviderJsWrapper::kPerProcessModuleName, 2643 isolate, InterfaceProviderJsWrapper::kPerProcessModuleName,
2641 InterfaceProviderJsWrapper::Create( 2644 InterfaceProviderJsWrapper::Create(
2642 isolate, context, RenderThread::Get()->GetRemoteInterfaces()) 2645 isolate, context, RenderThread::Get()->GetRemoteInterfaces())
2643 .ToV8()); 2646 .ToV8());
2647 registry->AddBuiltinModule(
esprehn 2017/02/01 06:02:23 This is exposing this new feature to all chrome://
2648 isolate, BlinkConnectorJsWrapper::kModuleName,
2649 BlinkConnectorJsWrapper::Create(
2650 isolate, context,
2651 static_cast<BlinkConnectorImpl*>(
2652 RenderThreadImpl::current()->blink_platform_impl()->connector()))
2653 .ToV8());
2644 } 2654 }
2645 2655
2646 void RenderFrameImpl::AddMessageToConsole(ConsoleMessageLevel level, 2656 void RenderFrameImpl::AddMessageToConsole(ConsoleMessageLevel level,
2647 const std::string& message) { 2657 const std::string& message) {
2648 blink::WebConsoleMessage::Level target_level = 2658 blink::WebConsoleMessage::Level target_level =
2649 blink::WebConsoleMessage::LevelInfo; 2659 blink::WebConsoleMessage::LevelInfo;
2650 switch (level) { 2660 switch (level) {
2651 case CONSOLE_MESSAGE_LEVEL_VERBOSE: 2661 case CONSOLE_MESSAGE_LEVEL_VERBOSE:
2652 target_level = blink::WebConsoleMessage::LevelVerbose; 2662 target_level = blink::WebConsoleMessage::LevelVerbose;
2653 break; 2663 break;
(...skipping 4208 matching lines...) Expand 10 before | Expand all | Expand 10 after
6862 // event target. Potentially a Pepper plugin will receive the event. 6872 // event target. Potentially a Pepper plugin will receive the event.
6863 // In order to tell whether a plugin gets the last mouse event and which it 6873 // In order to tell whether a plugin gets the last mouse event and which it
6864 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6874 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6865 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6875 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6866 // |pepper_last_mouse_event_target_|. 6876 // |pepper_last_mouse_event_target_|.
6867 pepper_last_mouse_event_target_ = nullptr; 6877 pepper_last_mouse_event_target_ = nullptr;
6868 #endif 6878 #endif
6869 } 6879 }
6870 6880
6871 } // namespace content 6881 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698