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

Side by Side Diff: content/shell/renderer/layout_test/layout_test_content_renderer_client.cc

Issue 1897363003: Use correct WebView from EventSender. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed initial state of EventSender. Created 4 years, 8 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 (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 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/shell/renderer/layout_test/layout_test_content_renderer_client .h" 5 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client .h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/debugger.h" 9 #include "base/debug/debugger.h"
10 #include "components/test_runner/mock_credential_manager_client.h" 10 #include "components/test_runner/mock_credential_manager_client.h"
11 #include "components/test_runner/web_frame_test_proxy.h" 11 #include "components/test_runner/web_frame_test_proxy.h"
12 #include "components/test_runner/web_test_interfaces.h" 12 #include "components/test_runner/web_test_interfaces.h"
13 #include "components/test_runner/web_test_proxy.h" 13 #include "components/test_runner/web_test_proxy.h"
14 #include "components/test_runner/web_test_runner.h" 14 #include "components/test_runner/web_test_runner.h"
15 #include "components/web_cache/renderer/web_cache_render_thread_observer.h" 15 #include "components/web_cache/renderer/web_cache_render_thread_observer.h"
16 #include "content/common/input/input_event_utils.h"
16 #include "content/public/common/content_constants.h" 17 #include "content/public/common/content_constants.h"
17 #include "content/public/common/content_switches.h" 18 #include "content/public/common/content_switches.h"
19 #include "content/public/renderer/render_frame.h"
18 #include "content/public/renderer/render_view.h" 20 #include "content/public/renderer/render_view.h"
19 #include "content/public/test/layouttest_support.h" 21 #include "content/public/test/layouttest_support.h"
20 #include "content/shell/common/shell_switches.h" 22 #include "content/shell/common/shell_switches.h"
21 #include "content/shell/renderer/layout_test/blink_test_helpers.h" 23 #include "content/shell/renderer/layout_test/blink_test_helpers.h"
22 #include "content/shell/renderer/layout_test/blink_test_runner.h" 24 #include "content/shell/renderer/layout_test/blink_test_runner.h"
23 #include "content/shell/renderer/layout_test/layout_test_render_frame_observer.h " 25 #include "content/shell/renderer/layout_test/layout_test_render_frame_observer.h "
24 #include "content/shell/renderer/layout_test/layout_test_render_thread_observer. h" 26 #include "content/shell/renderer/layout_test/layout_test_render_thread_observer. h"
25 #include "content/shell/renderer/layout_test/test_media_stream_renderer_factory. h" 27 #include "content/shell/renderer/layout_test/test_media_stream_renderer_factory. h"
26 #include "content/shell/renderer/shell_render_view_observer.h" 28 #include "content/shell/renderer/shell_render_view_observer.h"
27 #include "content/test/mock_webclipboard_impl.h" 29 #include "content/test/mock_webclipboard_impl.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 } 63 }
62 proxy->set_view_test_client(LayoutTestRenderThreadObserver::GetInstance() 64 proxy->set_view_test_client(LayoutTestRenderThreadObserver::GetInstance()
63 ->test_interfaces() 65 ->test_interfaces()
64 ->CreateWebViewTestClient(proxy)); 66 ->CreateWebViewTestClient(proxy));
65 proxy->SetInterfaces( 67 proxy->SetInterfaces(
66 LayoutTestRenderThreadObserver::GetInstance()->test_interfaces()); 68 LayoutTestRenderThreadObserver::GetInstance()->test_interfaces());
67 } 69 }
68 70
69 void WebFrameTestProxyCreated(RenderFrame* render_frame, 71 void WebFrameTestProxyCreated(RenderFrame* render_frame,
70 test_runner::WebFrameTestProxyBase* proxy) { 72 test_runner::WebFrameTestProxyBase* proxy) {
73 test_runner::WebTestProxyBase* web_test_proxy_base =
74 GetWebTestProxyBase(render_frame->GetRenderView());
71 proxy->set_test_client(LayoutTestRenderThreadObserver::GetInstance() 75 proxy->set_test_client(LayoutTestRenderThreadObserver::GetInstance()
72 ->test_interfaces() 76 ->test_interfaces()
73 ->CreateWebFrameTestClient()); 77 ->CreateWebFrameTestClient(web_test_proxy_base));
74 } 78 }
75 79
76 } // namespace 80 } // namespace
77 81
78 LayoutTestContentRendererClient::LayoutTestContentRendererClient() { 82 LayoutTestContentRendererClient::LayoutTestContentRendererClient() {
79 EnableWebTestProxyCreation(base::Bind(&WebTestProxyCreated), 83 EnableWebTestProxyCreation(base::Bind(&WebTestProxyCreated),
80 base::Bind(&WebFrameTestProxyCreated)); 84 base::Bind(&WebFrameTestProxyCreated));
81 } 85 }
82 86
83 LayoutTestContentRendererClient::~LayoutTestContentRendererClient() { 87 LayoutTestContentRendererClient::~LayoutTestContentRendererClient() {
84 } 88 }
85 89
86 void LayoutTestContentRendererClient::RenderThreadStarted() { 90 void LayoutTestContentRendererClient::RenderThreadStarted() {
87 ShellContentRendererClient::RenderThreadStarted(); 91 ShellContentRendererClient::RenderThreadStarted();
88 shell_observer_.reset(new LayoutTestRenderThreadObserver()); 92 shell_observer_.reset(new LayoutTestRenderThreadObserver());
89 } 93 }
90 94
91 void LayoutTestContentRendererClient::RenderFrameCreated( 95 void LayoutTestContentRendererClient::RenderFrameCreated(
92 RenderFrame* render_frame) { 96 RenderFrame* render_frame) {
93 new LayoutTestRenderFrameObserver(render_frame); 97 new LayoutTestRenderFrameObserver(render_frame);
94 } 98 }
95 99
96 void LayoutTestContentRendererClient::RenderViewCreated( 100 void LayoutTestContentRendererClient::RenderViewCreated(
97 RenderView* render_view) { 101 RenderView* render_view) {
98 new ShellRenderViewObserver(render_view); 102 new ShellRenderViewObserver(render_view);
99 103
100 test_runner::WebTestProxyBase* proxy = GetWebTestProxyBase(render_view); 104 test_runner::WebTestProxyBase* proxy = GetWebTestProxyBase(render_view);
101 proxy->set_web_widget(render_view->GetWebView()); 105 proxy->set_web_widget(render_view->GetWebView());
102 proxy->set_web_view(render_view->GetWebView()); 106 proxy->set_web_view(render_view->GetWebView());
107 proxy->SetSendWheelGestures(UseGestureBasedWheelScrolling());
103 108
104 BlinkTestRunner* test_runner = BlinkTestRunner::Get(render_view); 109 BlinkTestRunner* test_runner = BlinkTestRunner::Get(render_view);
105 test_runner->Reset(false /* for_new_test */); 110 test_runner->Reset(false /* for_new_test */);
106 111
107 LayoutTestRenderThreadObserver::GetInstance() 112 LayoutTestRenderThreadObserver::GetInstance()
108 ->test_interfaces() 113 ->test_interfaces()
109 ->TestRunner() 114 ->TestRunner()
110 ->InitializeWebViewWithMocks(render_view->GetWebView()); 115 ->InitializeWebViewWithMocks(render_view->GetWebView());
111 116
112 test_runner::WebTestDelegate* delegate = 117 test_runner::WebTestDelegate* delegate =
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 LayoutTestContentRendererClient::CreateMediaStreamRendererFactory() { 191 LayoutTestContentRendererClient::CreateMediaStreamRendererFactory() {
187 #if defined(ENABLE_WEBRTC) 192 #if defined(ENABLE_WEBRTC)
188 return std::unique_ptr<MediaStreamRendererFactory>( 193 return std::unique_ptr<MediaStreamRendererFactory>(
189 new TestMediaStreamRendererFactory()); 194 new TestMediaStreamRendererFactory());
190 #else 195 #else
191 return nullptr; 196 return nullptr;
192 #endif 197 #endif
193 } 198 }
194 199
195 } // namespace content 200 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698