Title: [136628] trunk/Tools
- Revision
- 136628
- Author
- [email protected]
- Date
- 2012-12-04 20:40:49 -0800 (Tue, 04 Dec 2012)
Log Message
[BlackBerry] DRT - Tests under "dumpAsText" directory should be dumped as text
https://bugs.webkit.org/show_bug.cgi?id=103986
Patch by Xiaobo Wang <[email protected]> on 2012-12-04
Reviewed by Rob Buis.
Also move declaration of webSettingTransaction to before any WebSettings
::setXXX() calls so that it works as expected (commit only once in the
function scope).
* DumpRenderTree/blackberry/DumpRenderTree.cpp:
(shouldDumpAsText):
(BlackBerry::WebKit::DumpRenderTree::resetToConsistentStateBeforeTesting):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (136627 => 136628)
--- trunk/Tools/ChangeLog 2012-12-05 04:37:53 UTC (rev 136627)
+++ trunk/Tools/ChangeLog 2012-12-05 04:40:49 UTC (rev 136628)
@@ -1,3 +1,18 @@
+2012-12-04 Xiaobo Wang <[email protected]>
+
+ [BlackBerry] DRT - Tests under "dumpAsText" directory should be dumped as text
+ https://bugs.webkit.org/show_bug.cgi?id=103986
+
+ Reviewed by Rob Buis.
+
+ Also move declaration of webSettingTransaction to before any WebSettings
+ ::setXXX() calls so that it works as expected (commit only once in the
+ function scope).
+
+ * DumpRenderTree/blackberry/DumpRenderTree.cpp:
+ (shouldDumpAsText):
+ (BlackBerry::WebKit::DumpRenderTree::resetToConsistentStateBeforeTesting):
+
2012-12-04 Filip Pizlo <[email protected]>
display-profiler-output should be able to show source code
Modified: trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp (136627 => 136628)
--- trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp 2012-12-05 04:37:53 UTC (rev 136627)
+++ trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp 2012-12-05 04:40:49 UTC (rev 136628)
@@ -138,6 +138,11 @@
return url.contains("loading/");
}
+static bool shouldDumpAsText(const String& url)
+{
+ return url.contains("dumpAsText/");
+}
+
namespace BlackBerry {
namespace WebKit {
@@ -255,6 +260,10 @@
{
gTestRunner = TestRunner::create(url.utf8().data(), imageHash.utf8().data());
+ if (shouldDumpAsText(url)) {
+ gTestRunner->setDumpAsText(true);
+ gTestRunner->setGeneratePixelResults(false);
+ }
gTestRunner->setIconDatabaseEnabled(false);
DumpRenderTreeSupport::resetGeolocationMock(m_page);
@@ -268,6 +277,8 @@
WorkQueue::shared()->setFrozen(false);
WebSettings* settings = m_page->settings();
+ // Apply new settings to current page, see more in the destructor of WebSettingsTransaction.
+ WebSettingsTransaction webSettingTransaction(settings);
settings->setTextReflowMode(WebSettings::TextReflowDisabled);
settings->setJavaScriptEnabled(true);
@@ -285,8 +296,6 @@
settings->setFrameFlatteningEnabled(false);
settings->setMaximumPagesInCache(0);
settings->setPluginsEnabled(true);
- // Apply new settings to current page, see more in the destructor of WebSettingsTransaction.
- WebSettingsTransaction webSettingTransaction(settings);
BlackBerry::WebKit::DumpRenderTree::currentInstance()->page()->clearBackForwardList(false);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
