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

webkit/glue/webframe_impl.h

 /*
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 318 matching lines @@
   WebCore::Node* inspected_node_;
 
   // A way for the main frame to keep track of which frame has an active
   // match. Should be NULL for all other frames.
   WebFrameImpl* active_match_frame_;
 
   // The range of the active match for the current frame.
   RefPtr<WebCore::Range> active_match_;
 
   // The index of the active match.
-  size_t active_match_index_;
+  int active_match_index_;
 
   // This flag is used by the scoping effort to determine if we need to figure
   // out which rectangle is the active match. Once we find the active
   // rectangle we clear this flag.
   bool locating_active_rect_;
 
   // The scoping effort can time out and we need to keep track of where we
   // ended our last search so we can continue from where we left of.
   RefPtr<WebCore::Range> resume_scoping_from_range_;
 
   // Keeps track of the last string this frame searched for. This is used for
   // short-circuiting searches in the following scenarios: When a frame has
   // been searched and returned 0 results, we don't need to search that frame
   // again if the user is just adding to the search (making it more specific).
   std::wstring last_search_string_;
 
   // Keeps track of how many matches this frame has found so far, so that we
   // don't loose count between scoping efforts, and is also used (in conjunction
   // with last_search_string_ and scoping_complete_) to figure out if we need to
   // search the frame again.
-  size_t last_match_count_;
+  int last_match_count_;
 
   // This variable keeps a cumulative total of matches found so far for ALL the
   // frames on the page, and is only incremented by calling IncreaseMatchCount
   // (on the main frame only). It should be -1 for all other frames.
   size_t total_matchcount_;
 
   // This variable keeps a cumulative total of how many frames are currently
   // scoping, and is incremented/decremented on the main frame only.
   // It should be -1 for all other frames.
   int frames_scoping_count_;
 
   // Keeps track of whether the scoping effort was completed (the user may
   // interrupt it before it completes by submitting a new search).
   bool scoping_complete_;
 
   // Keeps track of when the scoping effort should next invalidate the scrollbar
   // and the frame area.
-  size_t next_invalidate_after_;
+  int next_invalidate_after_;
 
  private:
   // A bit mask specifying area of the frame to invalidate.
   enum AreaToInvalidate {
     INVALIDATE_NOTHING      = 0,
     INVALIDATE_CONTENT_AREA = 1,
     INVALIDATE_SCROLLBAR    = 2,  // vertical scrollbar only.
     INVALIDATE_ALL          = 3   // both content area and the scrollbar.
   };
 
@@ skipping 37 matching lines @@
   // The input fields that are interested in edit events and their associated
   // listeners.
   typedef HashMap<RefPtr<WebCore::HTMLInputElement>,
       webkit_glue::PasswordAutocompleteListener*> PasswordListenerMap;
   PasswordListenerMap password_listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(WebFrameImpl);
 };
 
 #endif  // WEBKIT_GLUE_WEBFRAME_IMPL_H_