Fix issue 5079: Incorrect "Active match ordinal" count during Find-in-page...

webkit/glue/webframe_impl.cc

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2006 Apple Computer, 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 335 matching lines @@
     // We can't load a javascript: URL if there is no Document!
     if (!frame_->document())
       return;
 
     // TODO(darin): Is this the best API to use here?  It works and seems good,
     // but will it change out from under us?
     String script =
         decodeURLEscapeSequences(kurl.string().substring(sizeof("javascript:")-1));
     WebCore::ScriptValue result = frame_->loader()->executeScript(script, true);
     String scriptResult;
-    if (result.getString(scriptResult) && 
+    if (result.getString(scriptResult) &&
         !frame_->loader()->isScheduledLocationChangePending()) {
       // TODO(darin): We need to figure out how to represent this in session
       // history.  Hint: don't re-eval script when the user or script navigates
       // back-n-forth (instead store the script result somewhere).
       LoadDocumentData(kurl, scriptResult, String("text/html"), String());
     }
     return;
   }
 
   StopLoading();  // make sure existing activity stops
@@ skipping 390 matching lines @@
           view->x() + view->visibleWidth(), view->y(),
           WebCore::ScrollbarTheme::nativeTheme()->scrollbarThickness(),
           view->visibleHeight());
       view->invalidateRect(scroll_bar_vert);
     }
   }
 #endif
 }
 
 void WebFrameImpl::IncreaseMatchCount(int count, int request_id) {
+  // This function should only be called on the mainframe.
+  DCHECK(this == static_cast<WebFrameImpl*>(GetView()->GetMainFrame()));
+
   total_matchcount_ += count;
 
   // Update the UI with the latest findings.
   WebViewDelegate* webview_delegate = GetView()->GetDelegate();
   DCHECK(webview_delegate);
   if (webview_delegate)
     webview_delegate->ReportFindInPageMatchCount(total_matchcount_, request_id,
                                                  frames_scoping_count_ == 0);
 }
 
@@ skipping 32 matching lines @@
   bool start_in_selection = true;
 
   DCHECK(frame() && frame()->view());
   bool found = frame()->findString(webcore_string, request.forward,
                                    request.match_case, wrap_within_frame,
                                    start_in_selection);
   if (found) {
 #if defined(OS_WIN)
     WebCore::RenderThemeWin::setFindInPageMode(true);
 #endif
+    // Store which frame was active. This will come in handy later when we
+    // change the active match ordinal below.
+    WebFrameImpl* old_active_frame = main_frame_impl->active_match_frame_;
     // Set this frame as the active frame (the one with the active highlight).
     main_frame_impl->active_match_frame_ = this;
 
     // We found something, so we can now query the selection for its position.
     Selection new_selection(frame()->selection()->selection());
     IntRect curr_selection_rect;
 
     // If we thought we found something, but it couldn't be selected (perhaps
     // because it was marked -webkit-user-select: none), we can't set it to
     // be active but we still continue searching. This matches Safari's
     // behavior, including some oddities when selectable and un-selectable text
     // are mixed on a page: see https://bugs.webkit.org/show_bug.cgi?id=19127.
     if (new_selection.isNone() ||
         (new_selection.start() == new_selection.end())) {
       active_match_ = NULL;
     } else {
       active_match_ = new_selection.toRange();
       curr_selection_rect = active_match_->boundingBox();
     }
 
     if (!request.find_next) {
       // This is a Find operation, so we set the flag to ask the scoping effort
       // to find the active rect for us so we can update the ordinal (n of m).
       locating_active_rect_ = true;
     } else {
-      // This is FindNext so we need to increment (or decrement) the count and
-      // wrap if needed.
-      request.forward ? ++active_match_index_ : --active_match_index_;
-      if (active_match_index_ + 1 > last_match_count_)
-        active_match_index_ = 0;
-      if (active_match_index_ + 1 == 0)
-        active_match_index_ = last_match_count_ - 1;
+      if (old_active_frame != this) {
+        // If the active frame has changed it means that we have a multi-frame
+        // page and we just switch to searching in a new frame. Then we just
+        // want to reset the index.
+        if (request.forward)
+          active_match_index_ = 0;
+        else
+          active_match_index_ = last_match_count_ - 1;
+      } else {
+        // We are still the active frame, so increment (or decrement) the
+        // |active_match_index|, wrapping if needed (on single frame pages).
+        request.forward ? ++active_match_index_ : --active_match_index_;
+        if (active_match_index_ + 1 > last_match_count_)
+          active_match_index_ = 0;
+        if (active_match_index_ + 1 == 0)
+          active_match_index_ = last_match_count_ - 1;
+      }
     }
 
 #if defined(OS_WIN)
     // TODO(pinkerton): Fix Mac scrolling to be more like Win ScrollView
     if (selection_rect) {
       gfx::Rect rect = webkit_glue::FromIntRect(
           frame()->view()->convertToContainingWindow(curr_selection_rect));
       rect.Offset(-frameview()->scrollOffset().width(),
                   -frameview()->scrollOffset().height());
       *selection_rect = rect;
@@ skipping 17 matching lines @@
 int WebFrameImpl::OrdinalOfFirstMatchForFrame(WebFrameImpl* frame) const {
   int ordinal = 0;
   WebFrameImpl* const main_frame_impl =
     static_cast<WebFrameImpl*>(GetView()->GetMainFrame());
   // Iterate from the main frame up to (but not including) |frame| and
   // add up the number of matches found so far.
   for (WebFrameImpl* it = main_frame_impl;
        it != frame;
        it = static_cast<WebFrameImpl*>(
            webview_impl_->GetNextFrameAfter(it, true))) {
-    ordinal += it->last_match_count_;
+    if (it->last_match_count_ > 0)
+      ordinal += it->last_match_count_;
   }
 
   return ordinal;
 }
 
 bool WebFrameImpl::ShouldScopeMatches(FindInPageRequest request) {
   // Don't scope if we can't find a frame or if the frame is not visible.
   // The user may have closed the tab/application, so abort.
   if (!frame() || !Visible())
     return false;
@@ skipping 633 matching lines @@
   WebErrorImpl weberror_impl(error);
   alt_error_page_fetcher_.reset(
       new AltErrorPageResourceFetcher(webview_impl_, weberror_impl, this,
                                       error_page_url));
 }
 
 void WebFrameImpl::ExecuteJavaScript(const std::string& js_code,
                                      const GURL& script_url) {
   WebCore::ScriptSourceCode source_code(
       webkit_glue::StdStringToString(js_code),
-      webkit_glue::GURLToKURL(script_url), 
+      webkit_glue::GURLToKURL(script_url),
       1);  // base line number (for errors)
   frame_->loader()->executeScript(source_code);
 }
 
 std::wstring WebFrameImpl::GetName() {
   return webkit_glue::StringToStdWString(frame_->tree()->name());
 }
 
 WebTextInput* WebFrameImpl::GetTextInput() {
   if (!webtextinput_impl_.get()) {
@@ skipping 268 matching lines @@
   return password_listeners_.get(input_element);
 }
 
 void WebFrameImpl::ClearPasswordListeners() {
   for (PasswordListenerMap::iterator iter = password_listeners_.begin();
        iter != password_listeners_.end(); ++iter) {
     delete iter->second;
   }
   password_listeners_.clear();
 }
-