Merge 22369 - Fix plugin IPC issues....

webkit/glue/webplugin_impl.h

Index: webkit/glue/webplugin_impl.h
===================================================================
--- webkit/glue/webplugin_impl.h	(revision 23177)
+++ webkit/glue/webplugin_impl.h	(working copy)
@@ -41,6 +41,7 @@
 
 namespace WebKit {
 class WebURLResponse;
+class WebURLLoader;
 }
 
 namespace webkit_glue {
@@ -264,9 +265,6 @@
   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);
@@ -297,6 +295,8 @@
                                 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; }
 
@@ -333,6 +333,10 @@
     linked_ptr<WebKit::WebURLLoader> loader;
   };
 
+  // Helper functions
+  WebPluginResourceClient* GetClientFromLoader(WebKit::WebURLLoader* loader);
+  ClientInfo* GetClientInfoFromLoader(WebKit::WebURLLoader* loader);
+
   std::vector<ClientInfo> clients_;
 
   bool windowless_;
Property changes on: webkit\glue\webplugin_impl.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/glue/webplugin_impl.h:r3734-4217,4606-5108,5177-5263
   Merged /trunk/src/webkit/glue/webplugin_impl.h:r22369