Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(466)

Unified Diff: Source/core/html/HTMLPlugInElement.h

Issue 603193005: Move the Widget hierarchy to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Switch LocalFrame::m_pluginElements rep to HashSet<HTMLPlugInElement*> Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/html/HTMLPlugInElement.h
diff --git a/Source/core/html/HTMLPlugInElement.h b/Source/core/html/HTMLPlugInElement.h
index 45c59d9aa948febae1590127167fffc4f00dc809..404382c2b122d1936159f4db7daa05f4eaf9a9b8 100644
--- a/Source/core/html/HTMLPlugInElement.h
+++ b/Source/core/html/HTMLPlugInElement.h
@@ -46,6 +46,10 @@ class HTMLPlugInElement : public HTMLFrameOwnerElement {
public:
virtual ~HTMLPlugInElement();
virtual void trace(Visitor*) override;
+#if ENABLE(OILPAN)
+ virtual void disconnectContentFrame() override;
+ void shouldDisposePlugin();
+#endif
void resetInstance();
SharedPersistent<v8::Object>* pluginWrapper();
@@ -133,6 +137,8 @@ private:
bool pluginIsLoadable(const KURL&, const String& mimeType);
bool wouldLoadAsNetscapePlugin(const String& url, const String& serviceType);
+ void setPersistedPluginWidget(Widget*);
+
mutable RefPtr<SharedPersistent<v8::Object> > m_pluginWrapper;
NPObject* m_NPObject;
bool m_isCapturingMouseEvents;
@@ -146,7 +152,7 @@ private:
// prevent confusing code which may assume that widget() != null
// means the frame is active, we save off m_widget here while
// the plugin is persisting but not being displayed.
- RefPtr<Widget> m_persistedPluginWidget;
+ RefPtrWillBeMember<Widget> m_persistedPluginWidget;
};
inline bool isHTMLPlugInElement(const HTMLElement& element)

Powered by Google App Engine
This is Rietveld 408576698