Title: [131821] trunk/Tools
- Revision
- 131821
- Author
- joc...@chromium.org
- Date
- 2012-10-18 16:13:10 -0700 (Thu, 18 Oct 2012)
Log Message
[chromium] Simplify TestInterfaces, as this class won't be directly exposed in the TestRunner library's interface
https://bugs.webkit.org/show_bug.cgi?id=99766
Reviewed by Adam Barth.
This reverts http://trac.webkit.org/changeset/123240
* DumpRenderTree/chromium/TestRunner/TestInterfaces.cpp:
(TestInterfaces::TestInterfaces):
(TestInterfaces::~TestInterfaces):
(TestInterfaces::setWebView):
(TestInterfaces::setDelegate):
(TestInterfaces::bindTo):
(TestInterfaces::resetAll):
(TestInterfaces::accessibilityController):
(TestInterfaces::eventSender):
* DumpRenderTree/chromium/TestRunner/TestInterfaces.h:
(TestInterfaces):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (131820 => 131821)
--- trunk/Tools/ChangeLog 2012-10-18 23:06:59 UTC (rev 131820)
+++ trunk/Tools/ChangeLog 2012-10-18 23:13:10 UTC (rev 131821)
@@ -1,3 +1,24 @@
+2012-10-18 Jochen Eisinger <joc...@chromium.org>
+
+ [chromium] Simplify TestInterfaces, as this class won't be directly exposed in the TestRunner library's interface
+ https://bugs.webkit.org/show_bug.cgi?id=99766
+
+ Reviewed by Adam Barth.
+
+ This reverts http://trac.webkit.org/changeset/123240
+
+ * DumpRenderTree/chromium/TestRunner/TestInterfaces.cpp:
+ (TestInterfaces::TestInterfaces):
+ (TestInterfaces::~TestInterfaces):
+ (TestInterfaces::setWebView):
+ (TestInterfaces::setDelegate):
+ (TestInterfaces::bindTo):
+ (TestInterfaces::resetAll):
+ (TestInterfaces::accessibilityController):
+ (TestInterfaces::eventSender):
+ * DumpRenderTree/chromium/TestRunner/TestInterfaces.h:
+ (TestInterfaces):
+
2012-10-18 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r131810.
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/TestInterfaces.cpp (131820 => 131821)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/TestInterfaces.cpp 2012-10-18 23:06:59 UTC (rev 131820)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/TestInterfaces.cpp 2012-10-18 23:13:10 UTC (rev 131821)
@@ -37,33 +37,11 @@
#include "TextInputController.h"
#include "platform/WebString.h"
-#include <wtf/OwnPtr.h>
-
using WebKit::WebFrame;
using WebKit::WebString;
using WebKit::WebView;
-class TestInterfaces::Internal {
-public:
- Internal();
- ~Internal();
-
- void setWebView(WebView*);
- void setDelegate(TestDelegate*);
- void bindTo(WebFrame*);
- void resetAll();
-
- AccessibilityController* accessibilityController() { return m_accessibilityController.get(); }
- EventSender* eventSender() { return m_eventSender.get(); }
-
-private:
- OwnPtr<AccessibilityController> m_accessibilityController;
- OwnPtr<EventSender> m_eventSender;
- OwnPtr<GamepadController> m_gamepadController;
- OwnPtr<TextInputController> m_textInputController;
-};
-
-TestInterfaces::Internal::Internal()
+TestInterfaces::TestInterfaces()
{
m_accessibilityController = adoptPtr(new AccessibilityController());
m_eventSender = adoptPtr(new EventSender());
@@ -71,7 +49,7 @@
m_textInputController = adoptPtr(new TextInputController());
}
-TestInterfaces::Internal::~Internal()
+TestInterfaces::~TestInterfaces()
{
m_accessibilityController->setWebView(0);
m_eventSender->setWebView(0);
@@ -84,7 +62,7 @@
// m_textInputController doesn't depend on TestDelegate.
}
-void TestInterfaces::Internal::setWebView(WebView* webView)
+void TestInterfaces::setWebView(WebView* webView)
{
m_accessibilityController->setWebView(webView);
m_eventSender->setWebView(webView);
@@ -92,7 +70,7 @@
m_textInputController->setWebView(webView);
}
-void TestInterfaces::Internal::setDelegate(TestDelegate* delegate)
+void TestInterfaces::setDelegate(TestDelegate* delegate)
{
// m_accessibilityController doesn't depend on TestDelegate.
m_eventSender->setDelegate(delegate);
@@ -100,7 +78,7 @@
// m_textInputController doesn't depend on TestDelegate.
}
-void TestInterfaces::Internal::bindTo(WebFrame* frame)
+void TestInterfaces::bindTo(WebFrame* frame)
{
m_accessibilityController->bindToJavascript(frame, WebString::fromUTF8("accessibilityController"));
m_eventSender->bindToJavascript(frame, WebString::fromUTF8("eventSender"));
@@ -108,7 +86,7 @@
m_textInputController->bindToJavascript(frame, WebString::fromUTF8("textInputController"));
}
-void TestInterfaces::Internal::resetAll()
+void TestInterfaces::resetAll()
{
m_accessibilityController->reset();
m_eventSender->reset();
@@ -116,42 +94,12 @@
// m_textInputController doesn't have any state to reset.
}
-TestInterfaces::TestInterfaces()
- : m_internal(new TestInterfaces::Internal())
-{
-}
-
-TestInterfaces::~TestInterfaces()
-{
- delete m_internal;
-}
-
-void TestInterfaces::setWebView(WebView* webView)
-{
- m_internal->setWebView(webView);
-}
-
-void TestInterfaces::setDelegate(TestDelegate* delegate)
-{
- m_internal->setDelegate(delegate);
-}
-
-void TestInterfaces::bindTo(WebFrame* frame)
-{
- m_internal->bindTo(frame);
-}
-
-void TestInterfaces::resetAll()
-{
- m_internal->resetAll();
-}
-
AccessibilityController* TestInterfaces::accessibilityController()
{
- return m_internal->accessibilityController();
+ return m_accessibilityController.get();
}
EventSender* TestInterfaces::eventSender()
{
- return m_internal->eventSender();
+ return m_eventSender.get();
}
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/TestInterfaces.h (131820 => 131821)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/TestInterfaces.h 2012-10-18 23:06:59 UTC (rev 131820)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/TestInterfaces.h 2012-10-18 23:13:10 UTC (rev 131821)
@@ -31,6 +31,8 @@
#ifndef TestInterfaces_h
#define TestInterfaces_h
+#include <wtf/OwnPtr.h>
+
namespace WebKit {
class WebFrame;
class WebView;
@@ -38,7 +40,9 @@
class AccessibilityController;
class EventSender;
+class GamepadController;
class TestDelegate;
+class TextInputController;
class TestInterfaces {
public:
@@ -54,8 +58,10 @@
EventSender* eventSender();
private:
- class Internal;
- Internal* m_internal;
+ OwnPtr<AccessibilityController> m_accessibilityController;
+ OwnPtr<EventSender> m_eventSender;
+ OwnPtr<GamepadController> m_gamepadController;
+ OwnPtr<TextInputController> m_textInputController;
};
#endif // TestInterfaces_h
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
