Merge 22369 - Fix plugin IPC issues....

webkit/glue/webplugin.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_H__
 #define WEBKIT_GLUE_WEBPLUGIN_H__
 
 #include <string>
 #include <vector>
 
@@ skipping 113 matching lines @@
                                         bool notify_needed,
                                         intptr_t notify_data) = 0;
 
   // Returns true iff in off the record (Incognito) mode.
   virtual bool IsOffTheRecord() = 0;
 
   // Called when the WebPluginResourceClient instance is deleted.
   virtual void ResourceClientDeleted(
       WebPluginResourceClient* resource_client) {}
 
+  // Defers the loading of the resource identified by resource_id. This is
+  // controlled by the defer parameter.
+  virtual void SetDeferResourceLoading(int resource_id, bool defer) = 0;
+
  private:
   DISALLOW_EVIL_CONSTRUCTORS(WebPlugin);
 };
 
 // Simpler version of ResourceHandleClient that lends itself to proxying.
 class WebPluginResourceClient {
  public:
   virtual ~WebPluginResourceClient() {}
   virtual void WillSendRequest(const GURL& url) = 0;
   // The request_is_seekable parameter indicates whether byte range requests
   // can be issued for the underlying stream.
   virtual void DidReceiveResponse(const std::string& mime_type,
                                   const std::string& headers,
                                   uint32 expected_length,
                                   uint32 last_modified,
-                                  bool request_is_seekable,
-                                  bool* cancel) = 0;
+                                  bool request_is_seekable) = 0;
   virtual void DidReceiveData(const char* buffer, int length,
                               int data_offset) = 0;
   virtual void DidFinishLoading() = 0;
   virtual void DidFail() = 0;
   virtual bool IsMultiByteResponseExpected() = 0;
 };
 
 
 #endif  // #ifndef WEBKIT_GLUE_WEBPLUGIN_H__