Convert URLLoader to the new proxy design

webkit/plugins/ppapi/ppapi_plugin_instance.h

 // Copyright (c) 2012 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_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 102 matching lines @@
   MessageChannel& message_channel() { return *message_channel_; }
 
   WebKit::WebPluginContainer* container() const { return container_; }
 
   void set_always_on_top(bool on_top) { always_on_top_ = on_top; }
 
   // Returns the PP_Instance uniquely identifying this instance. Guaranteed
   // nonzero.
   PP_Instance pp_instance() const { return pp_instance_; }
 
+  ::ppapi::PPP_Instance_Combined* instance_interface() const {
+    return instance_interface_.get();
+  }
+
   ::ppapi::thunk::ResourceCreationAPI& resource_creation() {
     return *resource_creation_.get();
   }
 
   // Does some pre-destructor cleanup on the instance. This is necessary
   // because some cleanup depends on the plugin instance still existing (like
   // calling the plugin's DidDestroy function). This function is called from
   // the WebPlugin implementation when WebKit is about to remove the plugin.
   void Delete();
 
@@ skipping 22 matching lines @@
   void CommitBackingTexture();
 
   // Called when the out-of-process plugin implementing this instance crashed.
   void InstanceCrashed();
 
   // PPB_Instance and PPB_Instance_Private implementation.
   const GURL& plugin_url() const { return plugin_url_; }
   bool full_frame() const { return full_frame_; }
   const ::ppapi::ViewData& view_data() const { return view_data_; }
 
-  // PPP_Instance and PPP_Instance_Private pass-through.
+  // PPP_Instance and PPP_Instance_Private.
   bool Initialize(WebKit::WebPluginContainer* container,
                   const std::vector<std::string>& arg_names,
                   const std::vector<std::string>& arg_values,
                   const GURL& plugin_url,
                   bool full_frame);
-  bool HandleDocumentLoad(PPB_URLLoader_Impl* loader);
+  bool HandleDocumentLoad(const WebKit::WebURLResponse& response);
   bool HandleInputEvent(const WebKit::WebInputEvent& event,
                         WebKit::WebCursorInfo* cursor_info);
   PP_Var GetInstanceObject();
   void ViewChanged(const gfx::Rect& position, const gfx::Rect& clip,
                    const std::vector<gfx::Rect>& cut_outs_rects);
 
   // Handlers for composition events.
   bool HandleCompositionStart(const string16& text);
   bool HandleCompositionUpdate(
       const string16& text,
@@ skipping 147 matching lines @@
   // Simulates an input event to the plugin by passing it down to WebKit,
   // which sends it back up to the plugin as if it came from the user.
   void SimulateInputEvent(const ::ppapi::InputEventData& input_event);
 
   // Simulates an IME event at the level of RenderView which sends it back up to
   // the plugin as if it came from the user.
   bool SimulateIMEEvent(const ::ppapi::InputEventData& input_event);
   void SimulateImeSetCompositionEvent(
       const ::ppapi::InputEventData& input_event);
 
+  // The document loader is valid when the plugin is "full-frame" and in this
+  // case is non-NULL as long as the corresponding loader resource is alive.
+  // This pointer is non-owning, so the loader must use set_document_loader to
+  // clear itself when it is destroyed.
+  WebKit::WebURLLoaderClient* document_loader() const {
+    return document_loader_;
+  }
+  void set_document_loader(WebKit::WebURLLoaderClient* loader) {
+    document_loader_ = loader;
+  }
+
   ContentDecryptorDelegate* GetContentDecryptorDelegate();
 
   // PPB_Instance_API implementation.
   virtual PP_Bool BindGraphics(PP_Instance instance,
                                PP_Resource device) OVERRIDE;
   virtual PP_Bool IsFullFrame(PP_Instance instance) OVERRIDE;
   virtual const ::ppapi::ViewData* GetViewData(PP_Instance instance) OVERRIDE;
   virtual PP_Bool FlashIsFullscreen(PP_Instance instance) OVERRIDE;
   virtual PP_Var GetWindowObject(PP_Instance instance) OVERRIDE;
   virtual PP_Var GetOwnerElementObject(PP_Instance instance) OVERRIDE;
@@ skipping 395 matching lines @@
   PP_TimeTicks pending_user_gesture_;
 
   // The Flash proxy is associated with the instance.
   PPB_Flash_Impl flash_impl_;
 
   // We store the arguments so we can re-send them if we are reset to talk to
   // NaCl via the IPC NaCl proxy.
   std::vector<std::string> argn_;
   std::vector<std::string> argv_;
 
-  // This is NULL unless HandleDocumentLoad has called. In that case, we store
-  // the pointer so we can re-send it later if we are reset to talk to NaCl.
-  scoped_refptr<PPB_URLLoader_Impl> document_loader_;
+  // Non-owning pointer to the document loader, if any.
+  WebKit::WebURLLoaderClient* document_loader_;
 
   // The ContentDecryptorDelegate forwards PPP_ContentDecryptor_Private
   // calls and handles PPB_ContentDecryptor_Private calls.
   scoped_ptr<ContentDecryptorDelegate> content_decryptor_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginInstance);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_