Diff
Modified: trunk/Tools/ChangeLog (140280 => 140281)
--- trunk/Tools/ChangeLog 2013-01-20 20:45:16 UTC (rev 140280)
+++ trunk/Tools/ChangeLog 2013-01-20 21:30:37 UTC (rev 140281)
@@ -1,5 +1,32 @@
2013-01-20 Jochen Eisinger <[email protected]>
+ [chromium] move frame generation related methods to TestRunner
+ https://bugs.webkit.org/show_bug.cgi?id=107268
+
+ Reviewed by Adam Barth.
+
+ * DumpRenderTree/chromium/DRTTestRunner.cpp:
+ (DRTTestRunner::DRTTestRunner):
+ (DRTTestRunner::setWillSendRequestReturnsNull):
+ * DumpRenderTree/chromium/DRTTestRunner.h:
+ (DRTTestRunner):
+ * DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h:
+ (WebTestRunner::WebTestDelegate::display):
+ (WebTestRunner::WebTestDelegate::displayInvalidatedRegion):
+ * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
+ (WebTestRunner::TestRunner::TestRunner):
+ (WebTestRunner::TestRunner::display):
+ (WebTestRunner):
+ (WebTestRunner::TestRunner::displayInvalidatedRegion):
+ * DumpRenderTree/chromium/TestRunner/src/TestRunner.h:
+ (TestRunner):
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+ (WebViewHost::display):
+ (WebViewHost::displayInvalidatedRegion):
+ * DumpRenderTree/chromium/WebViewHost.h:
+
+2013-01-20 Jochen Eisinger <[email protected]>
+
[chromium] move speech related methods to TestRunner library
https://bugs.webkit.org/show_bug.cgi?id=107266
Modified: trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp (140280 => 140281)
--- trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp 2013-01-20 20:45:16 UTC (rev 140280)
+++ trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp 2013-01-20 21:30:37 UTC (rev 140281)
@@ -88,8 +88,6 @@
// they will use when called by _javascript_. The actual binding of those
// names to their methods will be done by calling bindToJavaScript() (defined
// by CppBoundClass, the parent to DRTTestRunner).
- bindMethod("display", &DRTTestRunner::display);
- bindMethod("displayInvalidatedRegion", &DRTTestRunner::displayInvalidatedRegion);
bindMethod("notifyDone", &DRTTestRunner::notifyDone);
bindMethod("queueBackNavigation", &DRTTestRunner::queueBackNavigation);
bindMethod("queueForwardNavigation", &DRTTestRunner::queueForwardNavigation);
@@ -431,22 +429,3 @@
m_shell->webViewHost()->setRequestReturnNull(arguments[0].value.boolValue);
result->setNull();
}
-
-void DRTTestRunner::display(const CppArgumentList& arguments, CppVariant* result)
-{
- WebViewHost* host = m_shell->webViewHost();
- const WebKit::WebSize& size = m_shell->webView()->size();
- WebRect rect(0, 0, size.width, size.height);
- host->proxy()->setPaintRect(rect);
- host->paintInvalidatedRegion();
- host->displayRepaintMask();
- result->setNull();
-}
-
-void DRTTestRunner::displayInvalidatedRegion(const CppArgumentList& arguments, CppVariant* result)
-{
- WebViewHost* host = m_shell->webViewHost();
- host->paintInvalidatedRegion();
- host->displayRepaintMask();
- result->setNull();
-}
Modified: trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h (140280 => 140281)
--- trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h 2013-01-20 20:45:16 UTC (rev 140280)
+++ trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h 2013-01-20 21:30:37 UTC (rev 140281)
@@ -107,9 +107,6 @@
// Causes WillSendRequest to return an empty request.
void setWillSendRequestReturnsNull(const CppArgumentList&, CppVariant*);
- void display(const CppArgumentList&, CppVariant*);
- void displayInvalidatedRegion(const CppArgumentList&, CppVariant*);
-
public:
// The following methods are not exposed to _javascript_.
void setWorkQueueFrozen(bool frozen) { m_workQueue.setFrozen(frozen); }
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h (140280 => 140281)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h 2013-01-20 20:45:16 UTC (rev 140280)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h 2013-01-20 21:30:37 UTC (rev 140281)
@@ -110,7 +110,8 @@
virtual void addMockSpeechRecognitionResult(const std::string&, double) { }
virtual void setMockSpeechRecognitionError(const std::string&, const std::string&) { }
virtual bool wasMockSpeechRecognitionAborted() { return false; }
-
+ virtual void display() { }
+ virtual void displayInvalidatedRegion() { }
};
}
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp (140280 => 140281)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp 2013-01-20 20:45:16 UTC (rev 140280)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp 2013-01-20 21:30:37 UTC (rev 140281)
@@ -234,6 +234,8 @@
bindMethod("setMockSpeechRecognitionError", &TestRunner::setMockSpeechRecognitionError);
bindMethod("wasMockSpeechRecognitionAborted", &TestRunner::wasMockSpeechRecognitionAborted);
#endif
+ bindMethod("display", &TestRunner::display);
+ bindMethod("displayInvalidatedRegion", &TestRunner::displayInvalidatedRegion);
// Properties.
bindProperty("workerThreadCount", &TestRunner::workerThreadCount);
@@ -1541,6 +1543,18 @@
}
#endif
+void TestRunner::display(const CppArgumentList& arguments, CppVariant* result)
+{
+ m_delegate->display();
+ result->setNull();
+}
+
+void TestRunner::displayInvalidatedRegion(const CppArgumentList& arguments, CppVariant* result)
+{
+ m_delegate->displayInvalidatedRegion();
+ result->setNull();
+}
+
void TestRunner::dumpEditingCallbacks(const CppArgumentList&, CppVariant* result)
{
m_dumpEditingCallbacks = true;
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h (140280 => 140281)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h 2013-01-20 20:45:16 UTC (rev 140280)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h 2013-01-20 21:30:37 UTC (rev 140281)
@@ -394,6 +394,9 @@
void wasMockSpeechRecognitionAborted(const CppArgumentList&, CppVariant*);
#endif
+ void display(const CppArgumentList&, CppVariant*);
+ void displayInvalidatedRegion(const CppArgumentList&, CppVariant*);
+
///////////////////////////////////////////////////////////////////////////
// Properties
void workerThreadCount(CppVariant*);
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (140280 => 140281)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2013-01-20 20:45:16 UTC (rev 140280)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2013-01-20 21:30:37 UTC (rev 140281)
@@ -1212,6 +1212,21 @@
}
#endif
+void WebViewHost::display()
+{
+ const WebKit::WebSize& size = webView()->size();
+ WebRect rect(0, 0, size.width, size.height);
+ proxy()->setPaintRect(rect);
+ paintInvalidatedRegion();
+ displayRepaintMask();
+}
+
+void WebViewHost::displayInvalidatedRegion()
+{
+ paintInvalidatedRegion();
+ displayRepaintMask();
+}
+
// Public functions -----------------------------------------------------------
WebViewHost::WebViewHost(TestShell* shell)
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.h (140280 => 140281)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2013-01-20 20:45:16 UTC (rev 140280)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2013-01-20 21:30:37 UTC (rev 140281)
@@ -177,6 +177,8 @@
virtual void setMockSpeechRecognitionError(const std::string&, const std::string&) OVERRIDE;
virtual bool wasMockSpeechRecognitionAborted() OVERRIDE;
#endif
+ virtual void display() OVERRIDE;
+ virtual void displayInvalidatedRegion() OVERRIDE;
// NavigationHost
virtual bool navigate(const TestNavigationEntry&, bool reload);
