Merge 141252

Source/WebKit/chromium/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 964 matching lines @@
     EXPECT_TRUE(frame->find(findIdentifier, WebString::fromUTF8("bar4"), options, false, 0));
     // Confirm stopFinding(false) sets the selection on the found text.
     frame->stopFinding(false);
     range = frame->selectionRange();
     ASSERT_FALSE(range.isNull());
     EXPECT_EQ(0, range.startOffset());
     EXPECT_EQ(4, range.endOffset());
     // "bar4" is surrounded by <span>, but the focusable node should be the parent <div>.
     EXPECT_EQ(WebString::fromUTF8("DIV"), frame->document().focusedNode().nodeName());
 
+    // Find in <select> content.
+    EXPECT_FALSE(frame->find(findIdentifier, WebString::fromUTF8("bar5"), options, false, 0));
+    // If there are any matches, stopFinding will set the selection on the found text.
+    // However, we do not expect any matches, so check that the selection is null.
+    frame->stopFinding(false);
+    range = frame->selectionRange();
+    ASSERT_TRUE(range.isNull());
+
     webView->close();
 }
 
 TEST_F(WebFrameTest, GetContentAsPlainText)
 {
     WebView* webView = FrameTestHelpers::createWebViewAndLoad("about:blank", true);
     // We set the size because it impacts line wrapping, which changes the
     // resulting text value.
     webView->resize(WebSize(640, 480));
     WebFrame* frame = webView->mainFrame();
@@ skipping 148 matching lines @@
 {
     registerMockedHttpURLLoad("find_in_page.html");
     registerMockedHttpURLLoad("find_in_page_frame.html");
 
     FindUpdateWebFrameClient client;
     WebView* webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "find_in_page.html", true, &client);
     webView->resize(WebSize(640, 480));
     webView->layout();
     webkit_support::RunAllPendingMessages();
 
+    // Note that the 'result 19' in the <select> element is not expected to produce a match.
     static const char* kFindString = "result";
     static const int kFindIdentifier = 12345;
-    static const int kNumResults = 16;
+    static const int kNumResults = 19;
 
     WebFindOptions options;
     WebString searchText = WebString::fromUTF8(kFindString);
     WebFrameImpl* mainFrame = static_cast<WebFrameImpl*>(webView->mainFrame());
     EXPECT_TRUE(mainFrame->find(kFindIdentifier, searchText, options, false, 0));
 
     mainFrame->resetMatchCount();
 
     for (WebFrame* frame = mainFrame; frame; frame = frame->traverseNext(false))
         frame->scopeStringMatches(kFindIdentifier, searchText, options, true);
@@ skipping 70 matching lines @@
     // Result 12 should be left to results 11, 13 and 14 in the table layout.
     EXPECT_TRUE(webMatchRects[12].x < webMatchRects[11].x);
     EXPECT_TRUE(webMatchRects[12].x < webMatchRects[13].x);
     EXPECT_TRUE(webMatchRects[12].x < webMatchRects[14].x);
 
     // Results 13, 12 and 14 should be one above the other in that order because of the rowspan
     // and vertical-align: middle by default.
     EXPECT_TRUE(webMatchRects[13].y < webMatchRects[12].y);
     EXPECT_TRUE(webMatchRects[12].y < webMatchRects[14].y);
 
+    // Result 16 should be below result 15.
+    EXPECT_TRUE(webMatchRects[15].y > webMatchRects[14].y);
+
+    // Result 18 should be normalized with respect to the position:relative div, and not it's
+    // immediate containing div. Consequently, result 18 should be above result 17.
+    EXPECT_TRUE(webMatchRects[17].y > webMatchRects[18].y);
+
     // Resizing should update the rects version.
     webView->resize(WebSize(800, 600));
     webkit_support::RunAllPendingMessages();
     EXPECT_TRUE(mainFrame->findMatchMarkersVersion() != rectsVersion);
 
     webView->close();
 }
 
 TEST_F(WebFrameTest, FindInPageSkipsHiddenFrames)
 {
@@ skipping 478 matching lines @@
     webkit_support::RegisterMockedErrorURL(URLTestHelpers::toKURL(errorURL), response, error);
     frame->loadHistoryItem(errorHistoryItem);
     webkit_support::ServeAsynchronousMockedRequests();
 
     WebString text = frame->contentAsText(std::numeric_limits<size_t>::max());
     EXPECT_EQ("This should appear", std::string(text.utf8().data()));
     EXPECT_TRUE(webFrameClient.commitCalled());
 }
 
 } // namespace