diff options
| author | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-24 23:46:50 +0000 |
|---|---|---|
| committer | finnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-24 23:46:50 +0000 |
| commit | 884db41554423ec017c57709f92cc2379e0cc02d (patch) | |
| tree | 275e81e0c6ab0717912dd4864d91ad719bd2a55c /webkit/glue/webview_impl.h | |
| parent | 498c1a6b2dc98869e0703127565247830227d075 (diff) | |
| download | chromium_src-884db41554423ec017c57709f92cc2379e0cc02d.zip chromium_src-884db41554423ec017c57709f92cc2379e0cc02d.tar.gz chromium_src-884db41554423ec017c57709f92cc2379e0cc02d.tar.bz2 | |
Find now uses WebKit's TextMatch highlighting for Find-in-page.
This allows us to discard a bunch of code and plumbing related to
maintaining and passing around the tickmark vector.
WebKit now owns the drawing of the highlights for inactive matches and
we use the selection controller to draw the active highlight.
I also simplified the code by eliminating the separate FindNext
function, which has been merged into Find.
This change also requires minor changes to WebKit upstream (sold
seperately, void where prohibited).
It simply consists of adding one empty virtual paint function to
ScrollbarThemeComposite.h (paintTickmarks) and in
ScrollbarThemeComposite::paint call paintTickmarks().
This fixes/makes obsolete a slew of bugs:
BUG=1326399, 1241554,1143991, 1070190, 1023019, 984786, 893737, 868599
... and a couple of external ones as well. Full list:
1326399 Find highlighting disappears on ThinkPad x60s
1241554 Find doesn't highlight word inside blinky tag
1143991 Have find-in-page code use skia and have inspected node highlighting set the right xfermode
1070190 Find should begin searching from caret/selection
1023019 Find not highlighting correctly
984786 Find highlight drawing code causes ClearType text to look bad
893737 Find in page should search textareas
868599 Find in page tick marks incorrectly appear on nested scrollbars
298 Find-In-page should highlight elided entries
4389 Find-in-box is not highlighting all the instances of the search word
3908 Find in page highlighting and tickmarks are broken
Review URL: http://codereview.chromium.org/11364
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5946 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webview_impl.h')
| -rw-r--r-- | webkit/glue/webview_impl.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/webkit/glue/webview_impl.h b/webkit/glue/webview_impl.h index a9b4763..ed457e9 100644 --- a/webkit/glue/webview_impl.h +++ b/webkit/glue/webview_impl.h @@ -206,9 +206,6 @@ class WebViewImpl : public WebView, public WebCore::BackForwardListClient { // WebCore::WidgetClientWin virtual const SkBitmap* getPreloadedResourceBitmap(int resource_id); virtual void onScrollPositionChanged(WebCore::Widget* widget); - virtual const WTF::Vector<RefPtr<WebCore::Range> >* getTickmarks( - WebCore::Frame* frame); - virtual size_t getActiveTickmarkIndex(WebCore::Frame* frame); virtual bool isHidden(); #endif |