Oilpan: move WebPluginLoadObserver to the heap.

third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

Index: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
index f759d64c16db09e33474834105355075a067529e..8f1623d9f865b7a611b2f3ce1a22e7b8c2397c2b 100644
--- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
+++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
@@ -472,7 +472,8 @@ void FrameLoaderClientImpl::dispatchDidCommitLoad(HistoryItem* item, HistoryComm
 void FrameLoaderClientImpl::dispatchDidFailProvisionalLoad(
     const ResourceError& error, HistoryCommitType commitType)
 {
-    OwnPtr<WebPluginLoadObserver> observer = pluginLoadObserver(m_webFrame->frame()->loader().provisionalDocumentLoader());
+    OwnPtrWillBeRawPtr<WebPluginLoadObserver> observer = pluginLoadObserver(m_webFrame->frame()->loader().provisionalDocumentLoader());
+    ScopedDisposal<WebPluginLoadObserver> disposeScope(observer.get());

[haraken, 2015/11/12 15:51:00]

Help me understand: Is there any reason we need to promptly call dispose()?
Wouldn't pre-finalizers be enough?

[sof, 2015/11/12 18:15:34]

I just wanted to emulate what happens !OILPAN, which is possible without much
incident here. Having them be GCed and swept out later would also work.

Actually, thinking about this some more, we can do a lot better with Oilpan --
there's no need for WebPluginContainerImpl to track the load observers. The only
purpose of doing is to be able to invalidate the weak references that
WebPluginLoadObservers have when WebPluginContainerImpl is finalized. We already
have mechanisms for that with Oilpan..WeakMember<>. Updated to do so instead.

     m_webFrame->didFail(error, true, commitType);
     if (observer)
         observer->didFailLoading(error);
@@ -480,7 +481,8 @@ void FrameLoaderClientImpl::dispatchDidFailProvisionalLoad(
 
 void FrameLoaderClientImpl::dispatchDidFailLoad(const ResourceError& error, HistoryCommitType commitType)
 {
-    OwnPtr<WebPluginLoadObserver> observer = pluginLoadObserver(m_webFrame->frame()->loader().documentLoader());
+    OwnPtrWillBeRawPtr<WebPluginLoadObserver> observer = pluginLoadObserver(m_webFrame->frame()->loader().documentLoader());
+    ScopedDisposal<WebPluginLoadObserver> disposeScope(observer.get());
     m_webFrame->didFail(error, false, commitType);
     if (observer)
         observer->didFailLoading(error);
@@ -492,7 +494,8 @@ void FrameLoaderClientImpl::dispatchDidFailLoad(const ResourceError& error, Hist
 
 void FrameLoaderClientImpl::dispatchDidFinishLoad()
 {
-    OwnPtr<WebPluginLoadObserver> observer = pluginLoadObserver(m_webFrame->frame()->loader().documentLoader());
+    OwnPtrWillBeRawPtr<WebPluginLoadObserver> observer = pluginLoadObserver(m_webFrame->frame()->loader().documentLoader());
+    ScopedDisposal<WebPluginLoadObserver> disposeScope(observer.get());
 
     if (m_webFrame->client())
         m_webFrame->client()->didFinishLoad(m_webFrame);
@@ -838,7 +841,7 @@ ObjectContentType FrameLoaderClientImpl::objectContentType(
     return ObjectContentNone;
 }
 
-PassOwnPtr<WebPluginLoadObserver> FrameLoaderClientImpl::pluginLoadObserver(DocumentLoader* loader)
+PassOwnPtrWillBeRawPtr<WebPluginLoadObserver> FrameLoaderClientImpl::pluginLoadObserver(DocumentLoader* loader)
 {
     return WebDataSourceImpl::fromDocumentLoader(loader)->releasePluginLoadObserver();
 }