Move PreFinalizer to WebPluginContainerImpl.

third_party/WebKit/Source/web/WebPluginContainerImpl.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2014 Opera Software ASA. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 43 matching lines @@
 class MouseEvent;
 class ResourceError;
 class ResourceResponse;
 class TouchEvent;
 class WebPlugin;
 class WheelEvent;
 struct WebPrintParams;
 struct WebPrintPresetOptions;
 
 class WEB_EXPORT WebPluginContainerImpl final : public WebPluginContainerBase {
+  USING_PRE_FINALIZER(WebPluginContainerImpl, PreFinalize);
+
  public:
   static WebPluginContainerImpl* Create(HTMLPlugInElement* element,
                                         WebPlugin* web_plugin) {
     return new WebPluginContainerImpl(element, web_plugin);
   }
   ~WebPluginContainerImpl() override;
 
   // PluginView methods
   void SetParent(FrameView*) override;
   FrameView* Parent() const override { return parent_; };
@@ skipping 92 matching lines @@
   bool ExecuteEditCommand(const WebString& name,
                           const WebString& value) override;
 
   // Resource load events for the plugin's source data:
   void DidReceiveResponse(const ResourceResponse&) override;
   void DidReceiveData(const char* data, int data_length) override;
   void DidFinishLoading() override;
   void DidFailLoading(const ResourceError&) override;
 
   DECLARE_VIRTUAL_TRACE();
+  // USING_PRE_FINALIZER does not allow for virtual dispatch from the finalizer
+  // method. Here we call Dispose() which does the correct virtual dispatch.
+  void PreFinalize() { Dispose(); }

[haraken, 2017/05/22 04:54:56]

Would it be clearer if:

- Introduce DisposePlugin() as a non-virtual method.
- Make both PreFinalize() and Dispose() call DisposePlugin().

?

   void Dispose() override;
 
  private:
   // Sets |windowRect| to the content rect of the plugin in screen space.
   // Sets |clippedAbsoluteRect| to the visible rect for the plugin, clipped to
   // the visible screen of the root frame, in local space of the plugin.
   // Sets |unclippedAbsoluteRect| to the visible rect for the plugin (but
   // without also clipping to the screen), in local space of the plugin.
   void ComputeClipRectsForPlugin(
       const HTMLFrameOwnerElement* plugin_owner_element,
@@ skipping 48 matching lines @@
 // WebPluginContainerImpl is the only subclass of WebPluginContainer.
 DEFINE_TYPE_CASTS(WebPluginContainerImpl,
                   WebPluginContainer,
                   container,
                   true,
                   true);
 
 }  // namespace blink
 
 #endif