[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andersca at apple.com
andersca at apple.com
Wed Dec 22 14:50:21 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 72c3f19a667456a61ad4838e28fc0905d3757c3a
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 21 19:51:54 2010 +0000
Always clear the selection when the find string isn't found
https://bugs.webkit.org/show_bug.cgi?id=48087
<rdar://problem/8564640>
Reviewed by David Hyatt.
* WebProcess/WebPage/FindController.cpp:
(WebKit::FindController::findString):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70258 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index aa47800..0eefb02 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-21 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by David Hyatt.
+
+ Always clear the selection when the find string isn't found
+ https://bugs.webkit.org/show_bug.cgi?id=48087
+ <rdar://problem/8564640>
+
+ * WebProcess/WebPage/FindController.cpp:
+ (WebKit::FindController::findString):
+
2010-10-21 Alexey Proskuryakov <ap at apple.com>
Reviewed by John Sullivan.
diff --git a/WebKit2/WebProcess/WebPage/FindController.cpp b/WebKit2/WebProcess/WebPage/FindController.cpp
index da84703..228c5ad 100644
--- a/WebKit2/WebProcess/WebPage/FindController.cpp
+++ b/WebKit2/WebProcess/WebPage/FindController.cpp
@@ -78,14 +78,13 @@ void FindController::findString(const String& string, FindDirection findDirectio
bool shouldShowOverlay = false;
if (!found) {
- // And clear the selection.
- if (!string.isEmpty() && selectedFrame)
+ // Clear the selection.
+ if (selectedFrame)
selectedFrame->selection()->clear();
hideFindIndicator();
WebProcess::shared().connection()->send(Messages::WebPageProxy::MatchCountDidChange(string, 0), m_webPage->pageID());
-
} else {
shouldShowOverlay = findOptions & FindOptionsShowOverlay;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list