Fix bug 455: Active match in Find is not selected and links are not focused a...

webkit/glue/webframe.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_WEBFRAME_H__
-#define WEBKIT_GLUE_WEBFRAME_H__
+#ifndef WEBKIT_GLUE_WEBFRAME_H_
+#define WEBKIT_GLUE_WEBFRAME_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/gfx/bitmap_platform_device.h"
 #include "base/gfx/size.h"
 #include "webkit/glue/console_message_level.h"
 #include "webkit/glue/find_in_page_request.h"
 
@@ skipping 179 matching lines @@
   // uses an index into the tick-mark vector to figure out what the next
   // match is, alleviating the need to call findString on the content again.
   //
   // Returns true if the search string was found, false otherwise.
   virtual bool FindNext(const FindInPageRequest& request,
                         bool wrap_within_frame) = 0;
 
   // Notifies the frame that we are no longer interested in searching. This will
   // abort any asynchronous scoping effort already under way (see the function
   // ScopeStringMatches for details) and erase all tick-marks and highlighting
-  // from the previous search.
-  virtual void StopFinding() = 0;
+  // from the previous search. If |clear_selection| is true, it will also make
+  // sure the end state for the Find operation does not leave a selection.
+  // This can occur when the user clears the search string but does not close
+  // the find box.
+  virtual void StopFinding(bool clear_selection) = 0;
 
   // Counts how many times a particular string occurs within the frame. It
   // also retrieves the location of the string and updates a vector in the frame
   // so that tick-marks and highlighting can be drawn. This function does its
   // work asynchronously, by running for a certain time-slice and then
   // scheduling itself (co-operative multitasking) to be invoked later
   // (repeating the process until all matches have been found). This allows
   // multiple frames to be searched at the same time and provides a way to
   // cancel at any time (see CancelPendingScopingEffort). The parameter Request
   // specifies what to look for and Reset signals whether this is a brand new
@@ skipping 127 matching lines @@
 
   // Does this frame have an onunload or unbeforeunload event listener?
   virtual bool HasUnloadListener() = 0;
 
   // Is this frame reloading with allowing stale data? This will be true when
   // the encoding of the page is changed and it needs to be re-interpreted,
   // but no additional loads should occur.
   virtual bool IsReloadAllowingStaleData() const = 0;
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(WebFrame);
+  DISALLOW_COPY_AND_ASSIGN(WebFrame);
 };
 
-#endif  // WEBKIT_GLUE_WEBFRAME_H__
-
+#endif  // WEBKIT_GLUE_WEBFRAME_H_