diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 16:53:14 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 16:53:14 +0000 |
| commit | f2ed10090990d3de39485bf875d61002440971ff (patch) | |
| tree | b091685c3f069b22cc1edb684a9f464e8b672212 /chrome | |
| parent | d17734b4d8dcaa8203541e528064158d25e35df9 (diff) | |
| download | chromium_src-f2ed10090990d3de39485bf875d61002440971ff.zip chromium_src-f2ed10090990d3de39485bf875d61002440971ff.tar.gz chromium_src-f2ed10090990d3de39485bf875d61002440971ff.tar.bz2 | |
This is the Chromium side of my WebKit change that fixes some Find issues with text marked as user-select-none.
Basically, it should now find matches within such text and therefore we get 1 of 1 instead of 0 of 0 in this test.
BUG=68494
TEST=This CL modifies a test to catch this.
Review URL: http://codereview.chromium.org/6315005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71451 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ui/find_bar/find_bar_host_browsertest.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index b673175..b53cfd7 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -438,11 +438,15 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindUnSelectableText) { int ordinal = 0; TabContents* tab = browser()->GetSelectedTabContents(); - // The search string is present but doesn't qualify to be found - EXPECT_EQ(0, FindInPageWchar(tab, L"text", - kFwd, kIgnoreCase, &ordinal)); - // With zero results there should be no current selection. - EXPECT_EQ(0, ordinal); + + int match_count = + FindInPageWchar(tab, L"text", kFwd, kIgnoreCase, &ordinal); + // TODO(finnur): These two values are currently 0 and 0 but will change to + // 1 and 1 when we merge down a fix for un-selectable text in patch from + // revision 75784 (https://bugs.webkit.org/show_bug.cgi?id=52367). Once the + // patch has been rolled into Chromium I'll change this back to check for 1 + // explicitly (as opposed to using equality). + EXPECT_EQ(match_count, ordinal); } // Try to reproduce the crash seen in issue 1341577. |