Delete ReplayReceivedData, make WebViewPlugin not a WebFrameClient

components/plugins/renderer/webview_plugin.h

 // Copyright 2013 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 COMPONENTS_PLUGINS_RENDERER_WEBVIEW_PLUGIN_H_
 #define COMPONENTS_PLUGINS_RENDERER_WEBVIEW_PLUGIN_H_
 
 #include <list>
 #include <memory>
 
@@ skipping 24 matching lines @@
 
 // This class implements the WebPlugin interface by forwarding drawing and
 // handling input events to a WebView.
 // It can be used as a placeholder for an actual plugin, using HTML for the UI.
 // To show HTML data inside the WebViewPlugin,
 // call web_view->mainFrame()->loadHTMLString() with the HTML data and a fake
 // chrome:// URL as origin.
 
 class WebViewPlugin : public blink::WebPlugin,
                       public blink::WebViewClient,
-                      public blink::WebFrameClient,
                       public content::RenderViewObserver {
  public:
   class Delegate {
    public:
     // Called to get the V8 handle used to bind the lifetime to the frame.
     virtual v8::Local<v8::Value> GetV8Handle(v8::Isolate*) = 0;
 
     // Called upon a context menu event.
     virtual void ShowContextMenu(const blink::WebMouseEvent&) = 0;
 
@@ skipping 12 matching lines @@
   // and displaying |html_data|. |url| should be a (fake) data:text/html URL;
   // it is only used for navigation and never actually resolved.
   static WebViewPlugin* Create(content::RenderView* render_view,
                                Delegate* delegate,
                                const content::WebPreferences& preferences,
                                const std::string& html_data,
                                const GURL& url);
 
   blink::WebView* web_view() { return web_view_; }
 
-  // When loading a plugin document (i.e. a full page plugin not embedded in
-  // another page), we save all data that has been received, and replay it with
-  // this method on the actual plugin.
-  void ReplayReceivedData(blink::WebPlugin* plugin);
-
-  void RestoreTitleText();
+  bool focused() const { return focused_; }
+  const blink::WebString& old_title() const { return old_title_; }
 
   // WebPlugin methods:
   blink::WebPluginContainer* container() const override;
   // The WebViewPlugin, by design, never fails to initialize. It's used to
   // display placeholders and error messages, so it must never fail.
   bool initialize(blink::WebPluginContainer*) override;
   void destroy() override;
 
   v8::Local<v8::Object> v8ScriptableObject(v8::Isolate* isolate) override;
 
   void updateAllLifecyclePhases() override;
   void paint(blink::WebCanvas* canvas, const blink::WebRect& rect) override;
 
   // Coordinates are relative to the containing window.
   void updateGeometry(const blink::WebRect& window_rect,
                       const blink::WebRect& clip_rect,
                       const blink::WebRect& unobscured_rect,
                       const blink::WebVector<blink::WebRect>& cut_outs_rects,
                       bool is_visible) override;
 
   void updateFocus(bool foucsed, blink::WebFocusType focus_type) override;
   void updateVisibility(bool) override {}
 
   blink::WebInputEventResult handleInputEvent(
       const blink::WebInputEvent& event,
       blink::WebCursorInfo& cursor_info) override;
 
-  // didReceiveResponse() overrides both WebPlugin and WebFrameClient.
-  // The WebFrameClient variant receives callbacks, but the WebPlugin variant
-  // shouldn't.
-  // TODO(japhet): WebViewPlugin shouldn't be a WebFrameClient, after which
-  // didReceiveResponse() should have a NOTREACHED().
-  void didReceiveResponse(const blink::WebURLResponse& response) override {}
+  void didReceiveResponse(const blink::WebURLResponse& response) override;
   void didReceiveData(const char* data, int data_length) override;
   void didFinishLoading() override;
   void didFailLoading(const blink::WebURLError& error) override;
 
   // WebViewClient methods:
   bool acceptsLoadDrops() override;
 
   void setToolTipText(const blink::WebString&,
                       blink::WebTextDirection) override;
 
   void startDragging(blink::WebLocalFrame* frame,
                      const blink::WebDragData& drag_data,
                      blink::WebDragOperationsMask mask,
                      const blink::WebImage& image,
                      const blink::WebPoint& point) override;
 
   // TODO(ojan): Remove this override and have this class use a non-null
   // layerTreeView.
   bool allowsBrokenNullLayerTreeView() const override;
 
   // WebWidgetClient methods:
   void didInvalidateRect(const blink::WebRect&) override;
   void didChangeCursor(const blink::WebCursorInfo& cursor) override;
   void scheduleAnimation() override;
 
-  // WebFrameClient methods:
-  void didClearWindowObject(blink::WebLocalFrame* frame) override;
-
  private:
   friend class base::DeleteHelper<WebViewPlugin>;
   WebViewPlugin(content::RenderView* render_view,
                 Delegate* delegate,
                 const content::WebPreferences& preferences);
   ~WebViewPlugin() override;
 
   // content::RenderViewObserver methods:
   void OnDestruct() override;
   void OnZoomLevelChanged() override;
@@ skipping 12 matching lines @@
   // Owned by us, deleted via |close()|.
   blink::WebView* web_view_;
 
   // Owned by us, deleted via |close()|.
   blink::WebFrameWidget* web_frame_widget_;
 
   // Owned by us, deleted via |close()|.
   blink::WebFrame* web_frame_;
   gfx::Rect rect_;
 
-  std::list<std::string> data_;
-  std::unique_ptr<blink::WebURLError> error_;
   blink::WebString old_title_;
-  bool finished_loading_;
   bool focused_;
   bool is_painting_;
   bool is_resizing_;
 
+  // A helper needed to create a WebLocalFrame.
+  class PluginWebFrameClient : public blink::WebFrameClient {
+   public:
+    PluginWebFrameClient(WebViewPlugin* plugin) : plugin_(plugin) {}
+    ~PluginWebFrameClient() override {}
+    void didClearWindowObject(blink::WebLocalFrame* frame) override;
+
+   private:
+    WebViewPlugin* plugin_;
+  };
+  PluginWebFrameClient web_frame_client_;
+
   // Should be invalidated when destroy() is called.
   base::WeakPtrFactory<WebViewPlugin> weak_factory_;
 };
 
 #endif  // COMPONENTS_PLUGINS_RENDERER_WEBVIEW_PLUGIN_H_