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

Side by Side Diff: content/shell/renderer/test_runner/TestInterfaces.cpp

Issue 144013010: Move TextInputController from CppBoundClass to gin::Wrappable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: TextInputController1 -> TextInputController Created 6 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 | Annotate | Revision Log
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/shell/renderer/test_runner/TestInterfaces.h" 5 #include "content/shell/renderer/test_runner/TestInterfaces.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "content/shell/renderer/test_runner/AccessibilityController.h" 9 #include "content/shell/renderer/test_runner/AccessibilityController.h"
10 #include "content/shell/renderer/test_runner/EventSender.h" 10 #include "content/shell/renderer/test_runner/EventSender.h"
11 #include "content/shell/renderer/test_runner/GamepadController.h" 11 #include "content/shell/renderer/test_runner/GamepadController.h"
12 #include "content/shell/renderer/test_runner/TestRunner.h" 12 #include "content/shell/renderer/test_runner/TestRunner.h"
13 #include "content/shell/renderer/test_runner/TextInputController.h"
14 #include "content/shell/renderer/test_runner/WebTestProxy.h" 13 #include "content/shell/renderer/test_runner/WebTestProxy.h"
15 #include "third_party/WebKit/public/platform/WebString.h" 14 #include "third_party/WebKit/public/platform/WebString.h"
16 #include "third_party/WebKit/public/platform/WebURL.h" 15 #include "third_party/WebKit/public/platform/WebURL.h"
17 #include "third_party/WebKit/public/web/WebCache.h" 16 #include "third_party/WebKit/public/web/WebCache.h"
18 #include "third_party/WebKit/public/web/WebKit.h" 17 #include "third_party/WebKit/public/web/WebKit.h"
19 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" 18 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
20 #include "third_party/WebKit/public/web/WebView.h" 19 #include "third_party/WebKit/public/web/WebView.h"
21 20
22 using namespace blink; 21 using namespace blink;
23 using namespace std; 22 using namespace std;
24 23
25 namespace WebTestRunner { 24 namespace WebTestRunner {
26 25
27 TestInterfaces::TestInterfaces() 26 TestInterfaces::TestInterfaces()
28 : m_accessibilityController(new AccessibilityController()) 27 : m_accessibilityController(new AccessibilityController())
29 , m_eventSender(new EventSender(this)) 28 , m_eventSender(new EventSender(this))
30 , m_gamepadController(new GamepadController()) 29 , m_gamepadController(new GamepadController())
31 , m_textInputController(new TextInputController())
32 , m_testRunner(new TestRunner(this)) 30 , m_testRunner(new TestRunner(this))
33 , m_delegate(0) 31 , m_delegate(0)
34 { 32 {
35 blink::setLayoutTestMode(true); 33 blink::setLayoutTestMode(true);
36 34
37 // NOTE: please don't put feature specific enable flags here, 35 // NOTE: please don't put feature specific enable flags here,
38 // instead add them to RuntimeEnabledFeatures.in 36 // instead add them to RuntimeEnabledFeatures.in
39 37
40 resetAll(); 38 resetAll();
41 } 39 }
42 40
43 TestInterfaces::~TestInterfaces() 41 TestInterfaces::~TestInterfaces()
44 { 42 {
45 m_accessibilityController->setWebView(0); 43 m_accessibilityController->setWebView(0);
46 m_eventSender->setWebView(0); 44 m_eventSender->setWebView(0);
47 // m_gamepadController doesn't depend on WebView. 45 // m_gamepadController doesn't depend on WebView.
48 m_textInputController->setWebView(0);
49 m_testRunner->setWebView(0, 0); 46 m_testRunner->setWebView(0, 0);
50 47
51 m_accessibilityController->setDelegate(0); 48 m_accessibilityController->setDelegate(0);
52 m_eventSender->setDelegate(0); 49 m_eventSender->setDelegate(0);
53 m_gamepadController->setDelegate(0); 50 m_gamepadController->setDelegate(0);
54 // m_textInputController doesn't depend on WebTestDelegate.
55 m_testRunner->setDelegate(0); 51 m_testRunner->setDelegate(0);
56 } 52 }
57 53
58 void TestInterfaces::setWebView(WebView* webView, WebTestProxyBase* proxy) 54 void TestInterfaces::setWebView(WebView* webView, WebTestProxyBase* proxy)
59 { 55 {
60 m_proxy = proxy; 56 m_proxy = proxy;
61 m_accessibilityController->setWebView(webView); 57 m_accessibilityController->setWebView(webView);
62 m_eventSender->setWebView(webView); 58 m_eventSender->setWebView(webView);
63 // m_gamepadController doesn't depend on WebView. 59 // m_gamepadController doesn't depend on WebView.
64 m_textInputController->setWebView(webView);
65 m_testRunner->setWebView(webView, proxy); 60 m_testRunner->setWebView(webView, proxy);
66 } 61 }
67 62
68 void TestInterfaces::setDelegate(WebTestDelegate* delegate) 63 void TestInterfaces::setDelegate(WebTestDelegate* delegate)
69 { 64 {
70 m_accessibilityController->setDelegate(delegate); 65 m_accessibilityController->setDelegate(delegate);
71 m_eventSender->setDelegate(delegate); 66 m_eventSender->setDelegate(delegate);
72 m_gamepadController->setDelegate(delegate); 67 m_gamepadController->setDelegate(delegate);
73 // m_textInputController doesn't depend on WebTestDelegate.
74 m_testRunner->setDelegate(delegate); 68 m_testRunner->setDelegate(delegate);
75 m_delegate = delegate; 69 m_delegate = delegate;
76 } 70 }
77 71
78 void TestInterfaces::bindTo(WebFrame* frame) 72 void TestInterfaces::bindTo(WebFrame* frame)
79 { 73 {
80 m_accessibilityController->bindToJavascript(frame, WebString::fromUTF8("acce ssibilityController")); 74 m_accessibilityController->bindToJavascript(frame, WebString::fromUTF8("acce ssibilityController"));
81 m_eventSender->bindToJavascript(frame, WebString::fromUTF8("eventSender")); 75 m_eventSender->bindToJavascript(frame, WebString::fromUTF8("eventSender"));
82 m_gamepadController->bindToJavascript(frame, WebString::fromUTF8("gamepadCon troller")); 76 m_gamepadController->bindToJavascript(frame, WebString::fromUTF8("gamepadCon troller"));
83 m_textInputController->bindToJavascript(frame, WebString::fromUTF8("textInpu tController"));
84 m_testRunner->bindToJavascript(frame, WebString::fromUTF8("testRunner")); 77 m_testRunner->bindToJavascript(frame, WebString::fromUTF8("testRunner"));
85 m_testRunner->bindToJavascript(frame, WebString::fromUTF8("layoutTestControl ler")); 78 m_testRunner->bindToJavascript(frame, WebString::fromUTF8("layoutTestControl ler"));
86 } 79 }
87 80
88 void TestInterfaces::resetTestHelperControllers() 81 void TestInterfaces::resetTestHelperControllers()
89 { 82 {
90 m_accessibilityController->reset(); 83 m_accessibilityController->reset();
91 m_eventSender->reset(); 84 m_eventSender->reset();
92 m_gamepadController->reset(); 85 m_gamepadController->reset();
93 // m_textInputController doesn't have any state to reset.
94 WebCache::clear(); 86 WebCache::clear();
95 } 87 }
96 88
97 void TestInterfaces::resetAll() 89 void TestInterfaces::resetAll()
98 { 90 {
99 resetTestHelperControllers(); 91 resetTestHelperControllers();
100 m_testRunner->reset(); 92 m_testRunner->reset();
101 } 93 }
102 94
103 void TestInterfaces::setTestIsRunning(bool running) 95 void TestInterfaces::setTestIsRunning(bool running)
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 if (!m_themeEngine.get()) 172 if (!m_themeEngine.get())
181 m_themeEngine.reset(new WebTestThemeEngineMac()); 173 m_themeEngine.reset(new WebTestThemeEngineMac());
182 #else 174 #else
183 if (!m_themeEngine.get()) 175 if (!m_themeEngine.get())
184 m_themeEngine.reset(new WebTestThemeEngineMock()); 176 m_themeEngine.reset(new WebTestThemeEngineMock());
185 #endif 177 #endif
186 return m_themeEngine.get(); 178 return m_themeEngine.get();
187 } 179 }
188 180
189 } 181 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698