Oilpan: simplify plugin container finalization.

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 44 matching lines @@
 class ResourceResponse;
 class TouchEvent;
 class WebPlugin;
 class WheelEvent;
 class Widget;
 struct WebPrintParams;
 struct WebPrintPresetOptions;
 
 class WebPluginContainerImpl final : public PluginView, public WebPluginContainer, public LocalFrameLifecycleObserver {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WebPluginContainerImpl);
+    WILL_BE_USING_PRE_FINALIZER(WebPluginContainerImpl, dispose);
 public:
     static PassRefPtrWillBeRawPtr<WebPluginContainerImpl> create(HTMLPlugInElement* element, WebPlugin* webPlugin)
     {
         return adoptRefWillBeNoop(new WebPluginContainerImpl(element, webPlugin));
     }
 
     // PluginView methods
     WebLayer* platformLayer() const override;
     v8::Local<v8::Object> scriptableObject(v8::Isolate*) override;
     bool getFormValue(String&) override;
@@ skipping 76 matching lines @@
 
     // Resource load events for the plugin's source data:
     void didReceiveResponse(const ResourceResponse&) override;
     void didReceiveData(const char *data, int dataLength) override;
     void didFinishLoading();
     void didFailLoading(const ResourceError&);
 
     DECLARE_VIRTUAL_TRACE();
     void dispose() override;
 
-#if ENABLE(OILPAN)
-    LocalFrame* pluginFrame() const override { return frame(); }
-    void shouldDisposePlugin() override;
-#endif
-
 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* pluginOwnerElement, IntRect& windowRect, IntRect& clippedLocalRect, IntRect& unclippedIntLocalRect) const;
 
     WebPluginContainerImpl(HTMLPlugInElement*, WebPlugin*);
     ~WebPluginContainerImpl() override;
 
@@ skipping 23 matching lines @@
     WebPlugin* m_webPlugin;
 
     WebLayer* m_webLayer;
 
     IntRect m_pendingInvalidationRect;
 
     TouchEventRequestType m_touchEventRequestType;
     bool m_wantsWheelEvents;
 
     bool m_inDispose;
-#if ENABLE(OILPAN)
-    // Oilpan: if true, the plugin container must dispose
-    // of its plugin when being finalized.
-    bool m_shouldDisposePlugin;
-#endif
 };
 
 DEFINE_TYPE_CASTS(WebPluginContainerImpl, Widget, widget, widget->isPluginContainer(), widget.isPluginContainer());
 // Unlike Widget, we need not worry about object type for container.
 // WebPluginContainerImpl is the only subclass of WebPluginContainer.
 DEFINE_TYPE_CASTS(WebPluginContainerImpl, WebPluginContainer, container, true, true);
 
 } // namespace blink
 
 #endif