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

Unified Diff: third_party/WebKit/Source/web/WebPluginContainerImpl.h

Issue 1442643003: Oilpan: move WebPluginLoadObserver to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: provide clearPluginContainer() w/ non-Oilpan only Created 5 years, 1 month 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: third_party/WebKit/Source/web/WebPluginContainerImpl.h
diff --git a/third_party/WebKit/Source/web/WebPluginContainerImpl.h b/third_party/WebKit/Source/web/WebPluginContainerImpl.h
index eaff5bd008f455b194b73e719076d52d2009d9e8..dad54dbea510b74a6bf477de4479c2712a8e856e 100644
--- a/third_party/WebKit/Source/web/WebPluginContainerImpl.h
+++ b/third_party/WebKit/Source/web/WebPluginContainerImpl.h
@@ -114,7 +114,8 @@ public:
WebPoint rootFrameToLocalPoint(const WebPoint&) override;
WebPoint localToRootFramePoint(const WebPoint&) override;
- // This cannot be null.
+ // Non-Oilpan, this cannot be null. With Oilpan, it will be
+ // null when in a disposed state, pending finalization during the next GC.
WebPlugin* plugin() override { return m_webPlugin; }
void setPlugin(WebPlugin*) override;
@@ -154,7 +155,9 @@ public:
void didFinishLoading() override;
void didFailLoading(const ResourceError&) override;
+#if !ENABLE(OILPAN)
void willDestroyPluginLoadObserver(WebPluginLoadObserver*);
+#endif
DECLARE_VIRTUAL_TRACE();
void dispose() override;
@@ -198,7 +201,9 @@ private:
RawPtrWillBeMember<HTMLPlugInElement> m_element;
WebPlugin* m_webPlugin;
+#if !ENABLE(OILPAN)
Vector<WebPluginLoadObserver*> m_pluginLoadObservers;
+#endif
WebLayer* m_webLayer;
« no previous file with comments | « third_party/WebKit/Source/web/WebDataSourceImpl.cpp ('k') | third_party/WebKit/Source/web/WebPluginContainerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698