Replace MessageLoop+ScopedRunnableMethodFactory with WebCore::Timer+Vector...

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 13 matching lines @@
  */
 
 #ifndef WEBKIT_GLUE_WEBFRAME_IMPL_H_
 #define WEBKIT_GLUE_WEBFRAME_IMPL_H_
 
 #include "Frame.h"
 #include "PlatformString.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/RefCounted.h>
 
-#include "base/task.h"
 #include "webkit/api/public/WebFrame.h"
 #include "webkit/glue/webframeloaderclient_impl.h"
 
 class ChromePrintContext;
 class WebViewImpl;
 
 namespace gfx {
 class BitmapPlatformDevice;
 }
 
@@ skipping 216 matching lines @@
 
   // Informs the WebFrame that the Frame is being closed, called by the
   // WebFrameLoaderClient
   void Closing();
 
   // Used to check for leaks of this object.
   static int live_object_count_;
 
   WebFrameLoaderClient frame_loader_client_;
 
-  // This is a factory for creating cancelable tasks for this frame that run
-  // asynchronously in order to scope string matches during a find operation.
-  ScopedRunnableMethodFactory<WebFrameImpl> scope_matches_factory_;
-
   RefPtr<ClientHandle> client_handle_;
 
   // This is a weak pointer to our corresponding WebCore frame.  A reference to
   // ourselves is held while frame_ is valid.  See our Closing method.
   WebCore::Frame* frame_;
 
   // 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_;
 
@@ skipping 36 matching lines @@
 
   // 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.
   int next_invalidate_after_;
 
  private:
+  class DeferredScopeStringMatches;
+  friend class DeferredScopeStringMatches;
+
   // 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.
   };
 
   // Notifies the delegate about a new selection rect.
   void ReportFindInPageSelection(
@@ skipping 14 matching lines @@
   // not including) the frame passed in as a parameter and counts how many
   // matches have been found.
   int OrdinalOfFirstMatchForFrame(WebFrameImpl* frame) const;
 
   // Determines whether the scoping effort is required for a particular frame.
   // It is not necessary if the frame is invisible, for example, or if this
   // is a repeat search that already returned nothing last time the same prefix
   // was searched.
   bool ShouldScopeMatches(const string16& search_text);
 
+  // Queue up a deferred call to scopeStringMatches.
+  void ScopeStringMatchesSoon(
+      int identifier, const WebKit::WebString& search_text,
+      const WebKit::WebFindOptions& options, bool reset);
+
+  // Called by a DeferredScopeStringMatches instance.
+  void CallScopeStringMatches(
+      DeferredScopeStringMatches* deferred,
+      int identifier, const WebKit::WebString& search_text,
+      const WebKit::WebFindOptions& options, bool reset);
+
   // Determines whether to invalidate the content area and scrollbar.
   void InvalidateIfNecessary();
 
   // Clears the map of password listeners.
   void ClearPasswordListeners();
 
   void LoadJavaScriptURL(const WebCore::KURL& url);
 
+  // A list of all of the pending calls to scopeStringMatches.
+  Vector<DeferredScopeStringMatches*> deferred_scoping_work_;
+
   // Valid between calls to BeginPrint() and EndPrint(). Containts the print
   // information. Is used by PrintPage().
   OwnPtr<ChromePrintContext> print_context_;
 
   // The input fields that are interested in edit events and their associated
   // listeners.
   typedef HashMap<RefPtr<WebCore::HTMLInputElement>,
       WebKit::PasswordAutocompleteListener*> PasswordListenerMap;
   PasswordListenerMap password_listeners_;
 };
 
 #endif  // WEBKIT_GLUE_WEBFRAME_IMPL_H_