diff options
author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-08-18 23:41:05 +0200 |
---|---|---|
committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-08-19 03:18:29 +0200 |
commit | e5815346cd4870640051856abed0887717aa0bf7 (patch) | |
tree | 7ff7d8a66d1febfcc793dbe67c9d3d182ab05977 /src/adblock/adblockruletextmatchimpl.cpp | |
parent | Merge commit 'refs/merge-requests/178' of git://gitorious.org/rekonq/mainline... (diff) | |
download | rekonq-e5815346cd4870640051856abed0887717aa0bf7.tar.xz |
Improve the performance of AdBlockRuleTextMatchImpl
Comparing unicode string without case sensitive is rather expensive
because each codepoint must be converted, which is non trivial for
unicode.
This patch introduce a new argument of ::match() taking the encoded
url in lowercase. This way, the conversion can be done only once
for a lot of rules.
Diffstat (limited to 'src/adblock/adblockruletextmatchimpl.cpp')
-rw-r--r-- | src/adblock/adblockruletextmatchimpl.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/adblock/adblockruletextmatchimpl.cpp b/src/adblock/adblockruletextmatchimpl.cpp index 7c02ea37..892d78e0 100644 --- a/src/adblock/adblockruletextmatchimpl.cpp +++ b/src/adblock/adblockruletextmatchimpl.cpp @@ -34,13 +34,18 @@ AdBlockRuleTextMatchImpl::AdBlockRuleTextMatchImpl(const QString &filter) { Q_ASSERT(AdBlockRuleTextMatchImpl::isTextMatchFilter(filter)); - m_textToMatch = filter; + m_textToMatch = filter.toLower(); m_textToMatch.remove(QL1C('*')); } -bool AdBlockRuleTextMatchImpl::match(const QString &encodedUrl) const +bool AdBlockRuleTextMatchImpl::match(const QString &encodedUrl, const QString &encodedUrlLowerCase) const { - return encodedUrl.contains(m_textToMatch, Qt::CaseInsensitive); + Q_UNUSED(encodedUrl); + // Case sensitive compare is faster, but would be incorrect with encodedUrl since + // we do want case insensitive. + // What we do is work on a lowercase version of m_textToMatch, and compare to the lowercase + // version of encodedUrl. + return encodedUrlLowerCase.contains(m_textToMatch, Qt::CaseSensitive); } bool AdBlockRuleTextMatchImpl::isTextMatchFilter(const QString &filter) |