Modified: trunk/Tools/ChangeLog (134397 => 134398)
--- trunk/Tools/ChangeLog 2012-11-13 12:48:11 UTC (rev 134397)
+++ trunk/Tools/ChangeLog 2012-11-13 12:49:42 UTC (rev 134398)
@@ -1,3 +1,20 @@
+2012-11-13 Xiaobo Wang <xbw...@torchmobile.com.cn>
+
+ [BlackBerry] DRT - platform/blackberry/editing/text-iterator/findString-markers.html failed
+ https://bugs.webkit.org/show_bug.cgi?id=102056
+
+ Reviewed by Rob Buis.
+
+ RIM PR 235836
+
+ TestRunner::findString() was changed to call Page::findString() instead
+ of WebPage::findNextString(). Page::findString() doesn't update
+ TextMatch markers.
+ Work-around by calling both Page::findString() and WebPage::findNextString().
+
+ * DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp:
+ (TestRunner::findString):
+
2012-11-12 Jochen Eisinger <joc...@chromium.org>
Add the TestRunner public API to the ChromiumPublicApi watchlist, and introduce an entry for ChromiumTestRunner
Modified: trunk/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp (134397 => 134398)
--- trunk/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp 2012-11-13 12:48:11 UTC (rev 134397)
+++ trunk/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp 2012-11-13 12:49:42 UTC (rev 134398)
@@ -402,7 +402,7 @@
return animationController->numberOfActiveAnimations(mainFrame->document());
}
-unsigned int TestRunner::workerThreadCount() const
+unsigned TestRunner::workerThreadCount() const
{
#if ENABLE_WORKERS
return WebCore::WorkerThread::workerThreadCount();
@@ -538,17 +538,17 @@
void TestRunner::addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
{
WebCore::SecurityPolicy::addOriginAccessWhitelistEntry(*WebCore::SecurityOrigin::createFromString(jsStringRefToWebCoreString(sourceOrigin)),
- jsStringRefToWebCoreString(destinationProtocol),
- jsStringRefToWebCoreString(destinationHost),
- allowDestinationSubdomains);
+ jsStringRefToWebCoreString(destinationProtocol),
+ jsStringRefToWebCoreString(destinationHost),
+ allowDestinationSubdomains);
}
void TestRunner::removeOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
{
WebCore::SecurityPolicy::removeOriginAccessWhitelistEntry(*WebCore::SecurityOrigin::createFromString(jsStringRefToWebCoreString(sourceOrigin)),
- jsStringRefToWebCoreString(destinationProtocol),
- jsStringRefToWebCoreString(destinationHost),
- allowDestinationSubdomains);
+ jsStringRefToWebCoreString(destinationProtocol),
+ jsStringRefToWebCoreString(destinationHost),
+ allowDestinationSubdomains);
}
void TestRunner::setAllowFileAccessFromFileURLs(bool enabled)
@@ -752,6 +752,13 @@
options |= WebCore::StartInSelection;
}
+ // FIXME: we don't need to call WebPage::findNextString(), this is a workaround
+ // so that test platform/blackberry/editing/text-iterator/findString-markers.html can pass.
+
+ // Our layout tests assume find will wrap and highlight all matches.
+ BlackBerry::WebKit::DumpRenderTree::currentInstance()->page()->findNextString(nameStr.utf8().data(),
+ !(options & WebCore::Backwards), !(options & WebCore::CaseInsensitive), true /* wrap */, true /* highlightAllMatches */);
+
return mainFrame->page()->findString(nameStr, options);
}
