Merge 22369 - Fix plugin IPC issues....

webkit/glue/webplugin_impl.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_WEBPLUGIN_IMPL_H_
 #define WEBKIT_GLUE_WEBPLUGIN_IMPL_H_
 
 #include <string>
 #include <map>
 #include <vector>
@@ skipping 23 matching lines @@
 class MouseEvent;
 class ResourceError;
 class ResourceResponse;
 class ScrollView;
 class String;
 class Widget;
 }
 
 namespace WebKit {
 class WebURLResponse;
+class WebURLLoader;
 }
 
 namespace webkit_glue {
 class MultipartResponseDelegate;
 }
 
 // Implements WebCore::Widget functions that WebPluginImpl needs.  This class
 // exists because it is possible for the plugin widget to be deleted at any
 // time because of a delegate javascript call.  However we don't want the
 // WebPluginImpl to be deleted from under us because it could be lower in the
@@ skipping 203 matching lines @@
   virtual void didSendData(WebKit::WebURLLoader* loader,
                            unsigned long long bytes_sent,
                            unsigned long long total_bytes_to_be_sent);
   virtual void didReceiveResponse(WebKit::WebURLLoader* loader,
                                   const WebKit::WebURLResponse& response);
   virtual void didReceiveData(WebKit::WebURLLoader* loader, const char *buffer,
                               int length, long long total_length);
   virtual void didFinishLoading(WebKit::WebURLLoader* loader);
   virtual void didFail(WebKit::WebURLLoader* loader, const WebKit::WebURLError&);
 
-  // Helper function
-  WebPluginResourceClient* GetClientFromLoader(WebKit::WebURLLoader* loader);
-
   // Helper function to remove the stored information about a resource
   // request given its index in m_clients.
   void RemoveClient(size_t i);
 
   // Helper function to remove the stored information about a resource
   // request given a handle.
   void RemoveClient(WebKit::WebURLLoader* loader);
 
   WebCore::Frame* frame() { return webframe_ ? webframe_->frame() : NULL; }
 
@@ skipping 10 matching lines @@
                         const char* buf, bool is_file_data,
                         bool notify, const char* url,
                         intptr_t notify_data, bool popups_allowed);
 
   void CancelDocumentLoad();
 
   void InitiateHTTPRangeRequest(const char* url, const char* range_info,
                                 intptr_t existing_stream, bool notify_needed,
                                 intptr_t notify_data);
 
+  void SetDeferResourceLoading(int resource_id, bool defer);
+
   // Ignore in-process plugins mode for this flag.
   bool IsOffTheRecord() { return false; }
 
   // Handles HTTP multipart responses, i.e. responses received with a HTTP
   // status code of 206.
   void HandleHttpMultipartResponse(const WebKit::WebURLResponse& response,
                                    WebPluginResourceClient* client);
 
   void HandleURLRequestInternal(const char *method, bool is_javascript_url,
                                 const char* target, unsigned int len,
@@ skipping 16 matching lines @@
   // Delayed task for downloading the plugin source URL.
   void OnDownloadPluginSrcUrl();
 
   struct ClientInfo {
     int id;
     WebPluginResourceClient* client;
     WebKit::WebURLRequest request;
     linked_ptr<WebKit::WebURLLoader> loader;
   };
 
+  // Helper functions
+  WebPluginResourceClient* GetClientFromLoader(WebKit::WebURLLoader* loader);
+  ClientInfo* GetClientInfoFromLoader(WebKit::WebURLLoader* loader);
+
   std::vector<ClientInfo> clients_;
 
   bool windowless_;
   gfx::PluginWindowHandle window_;
   WebCore::HTMLPlugInElement* element_;
   WebFrameImpl* webframe_;
 
   WebPluginDelegate* delegate_;
 
   // Don't use RefPtr here since doing so extends the lifetime of a plugin
@@ skipping 25 matching lines @@
 
   // Holds the list of argument values passed to the plugin.
   std::vector<std::string> arg_values_;
 
   ScopedRunnableMethodFactory<WebPluginImpl> method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebPluginImpl);
 };
 
 #endif  // #ifndef WEBKIT_GLUE_WEBPLUGIN_IMPL_H_