[haiku-webkit-commits] r286 - webkit/trunk/WebKit/haiku/WebPositive
- From: webkit@xxxxxxxxxxxxxxx
- To: haiku-webkit-commits@xxxxxxxxxxxxx
- Date: Thu, 04 Mar 2010 19:35:27 +0000
Author: stippi
Date: Thu Mar 4 19:35:26 2010
New Revision: 286
URL: http://mmlr.dyndns.org/changeset/286
Log:
Changed how auto-completion fills the choices. It doesn't remove choices with
the
same base URL anymore, but simply uses a lower priority for every less recent
choice with the same base URL, and then sorts the result list after fetching.
Previously, you would only get one choice for a given base URL, and that one was
more likely a longer URL, since it was visited more recently than the start page
of the respective site.
Modified:
webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp
Modified: webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp
==============================================================================
--- webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp Thu Mar 4
18:25:20 2010 (r285)
+++ webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp Thu Mar 4
19:35:26 2010 (r286)
@@ -94,6 +94,34 @@
}
+class URLChoice : public BAutoCompleter::Choice {
+public:
+ URLChoice(const BString& choiceText, const BString& displayText,
+ int32 matchPos, int32 matchLen, int32 priority)
+ :
+ BAutoCompleter::Choice(choiceText, displayText, matchPos,
matchLen),
+ fPriority(priority)
+ {
+ }
+
+ bool operator<(const URLChoice& other) const
+ {
+ if (fPriority > other.fPriority)
+ return true;
+ return DisplayText() < other.DisplayText();
+ }
+
+ bool operator==(const URLChoice& other) const
+ {
+ return fPriority == other.fPriority
+ && DisplayText() < other.DisplayText();
+ }
+
+private:
+ int32 fPriority;
+};
+
+
class BrowsingHistoryChoiceModel : public BAutoCompleter::ChoiceModel {
virtual void FetchChoicesFor(const BString& pattern)
{
@@ -110,6 +138,7 @@
return;
BString lastBaseURL;
+ int32 priority = INT_MAX;
count = history->countItems();
for (int32 i = 0; i < count; i++) {
@@ -120,17 +149,20 @@
continue;
if (lastBaseURL.Length() > 0
&& choiceText.FindFirst(lastBaseURL) >= 0) {
- continue;
- }
+ priority--;
+ } else
+ priority = INT_MAX;
int32 baseURLStart = choiceText.FindFirst("://") + 3;
int32 baseURLEnd = choiceText.FindFirst("/",
baseURLStart + 1);
lastBaseURL.SetTo(choiceText.String() + baseURLStart,
baseURLEnd - baseURLStart);
- fChoices.AddItem(new BAutoCompleter::Choice(choiceText,
- choiceText, matchPos, pattern.Length()));
+ fChoices.AddItem(new URLChoice(choiceText,
+ choiceText, matchPos, pattern.Length(),
priority));
}
history->Unlock();
+
+ fChoices.SortItems(_CompareChoices);
}
virtual int32 CountChoices() const
@@ -144,6 +176,17 @@
fChoices.ItemAt(index));
}
+ static int _CompareChoices(const void* a, const void* b)
+ {
+ const URLChoice* aChoice = *reinterpret_cast<const URLChoice*
const *>(a);
+ const URLChoice* bChoice = *reinterpret_cast<const URLChoice*
const *>(b);
+ if (*aChoice < *bChoice)
+ return -1;
+ else if (*aChoice == *bChoice)
+ return 0;
+ return 1;
+ }
+
private:
BList fChoices;
};
Other related posts:
- » [haiku-webkit-commits] r286 - webkit/trunk/WebKit/haiku/WebPositive - webkit
