[BlackBerry] Implement number of matches and current active match index for find-on-page

https://bugs.webkit.org/show_bug.cgi?id=95801

Patch by Andy Chen <andchen@rim.com> on 2012-09-05
Reviewed by Antonio Gomes.

- Calculate current match index for find-on-page
- Notify client when number of matches and current match index update.
PR 162090 162091.
Internally reviewed by Mike Fenton and Joe Mason

* Api/WebPageClient.h:
* WebKitSupport/InPageSearchManager.cpp:
(BlackBerry::WebKit::InPageSearchManager::DeferredScopeStringMatches::DeferredScopeStringMatches):
(BlackBerry::WebKit::InPageSearchManager::DeferredScopeStringMatches::doTimeout):
(InPageSearchManager::DeferredScopeStringMatches):
(BlackBerry::WebKit::InPageSearchManager::findNextString):
(BlackBerry::WebKit::InPageSearchManager::findAndMarkText):
(BlackBerry::WebKit::InPageSearchManager::scopeStringMatches):
(BlackBerry::WebKit::InPageSearchManager::scopeStringMatchesSoon):
(BlackBerry::WebKit::InPageSearchManager::callScopeStringMatches):
* WebKitSupport/InPageSearchManager.h:
(InPageSearchManager):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@127594 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 53b3ffda
......@@ -273,6 +273,7 @@ public:
virtual void requestUserMedia(const Platform::WebUserMediaRequest&) = 0;
virtual void cancelUserMediaRequest(const Platform::WebUserMediaRequest&) = 0;
virtual void updateFindStringResult(int numMatches, int currentIndex) = 0;
};
} // namespace WebKit
} // namespace BlackBerry
......
2012-09-05 Andy Chen <andchen@rim.com>
[BlackBerry] Implement number of matches and current active match index for find-on-page
https://bugs.webkit.org/show_bug.cgi?id=95801
Reviewed by Antonio Gomes.
- Calculate current match index for find-on-page
- Notify client when number of matches and current match index update.
PR 162090 162091.
Internally reviewed by Mike Fenton and Joe Mason
* Api/WebPageClient.h:
* WebKitSupport/InPageSearchManager.cpp:
(BlackBerry::WebKit::InPageSearchManager::DeferredScopeStringMatches::DeferredScopeStringMatches):
(BlackBerry::WebKit::InPageSearchManager::DeferredScopeStringMatches::doTimeout):
(InPageSearchManager::DeferredScopeStringMatches):
(BlackBerry::WebKit::InPageSearchManager::findNextString):
(BlackBerry::WebKit::InPageSearchManager::findAndMarkText):
(BlackBerry::WebKit::InPageSearchManager::scopeStringMatches):
(BlackBerry::WebKit::InPageSearchManager::scopeStringMatchesSoon):
(BlackBerry::WebKit::InPageSearchManager::callScopeStringMatches):
* WebKitSupport/InPageSearchManager.h:
(InPageSearchManager):
2012-09-04 Rob Buis <rbuis@rim.com>
[BlackBerry] FatFingers::cachingStrategy uses incorrect enum value
......
......@@ -48,11 +48,11 @@ private:
void clearTextMatches();
void setActiveMatchAndMarker(PassRefPtr<WebCore::Range>);
bool findAndMarkText(const String&, WebCore::Range*, WebCore::Frame*, const WebCore::FindOptions&, bool);
bool findAndMarkText(const String&, WebCore::Range*, WebCore::Frame*, const WebCore::FindOptions&, bool /* isNewSearch */, bool /* startFromSelection */);
bool shouldSearchForText(const String&);
void scopeStringMatches(const String& text, bool reset, WebCore::Frame* scopingFrame = 0);
void scopeStringMatchesSoon(WebCore::Frame* scopingFrame, const String& text, bool reset);
void callScopeStringMatches(DeferredScopeStringMatches* caller, WebCore::Frame* scopingFrame, const String& text, bool reset);
void scopeStringMatches(const String& text, bool reset, bool locateActiveMatchOnly, WebCore::Frame* scopingFrame = 0);
void scopeStringMatchesSoon(WebCore::Frame* scopingFrame, const String& text, bool reset, bool locateActiveMatchOnly);
void callScopeStringMatches(DeferredScopeStringMatches* caller, WebCore::Frame* scopingFrame, const String& text, bool reset, bool locateActiveMatchOnly);
void cancelPendingScopingEffort();
Vector<DeferredScopeStringMatches*> m_deferredScopingWork;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment