Oilpan: move WebPluginLoadObserver to the heap.

third_party/WebKit/Source/web/WebDataSourceImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 20 matching lines @@
 #include "config.h"
 #include "web/WebDataSourceImpl.h"
 
 #include "core/dom/Document.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLError.h"
 #include "public/platform/WebVector.h"
 
 namespace blink {
 
-static OwnPtr<WebPluginLoadObserver>& nextPluginLoadObserver()
+static OwnPtrWillBePersistent<WebPluginLoadObserver>& nextPluginLoadObserver()
 {
-    DEFINE_STATIC_LOCAL(OwnPtr<WebPluginLoadObserver>, nextPluginLoadObserver, ());
+    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WebPluginLoadObserver>, nextPluginLoadObserver, ());
     return nextPluginLoadObserver;

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

Nit: I remember we discussed before that the nextPluginLoadObserver is super
nasty...

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

The code using it in WebPluginContainerImpl::loadFrameRequest() does have a
FIXME acknowledging its dubious nature :)

 }
 
 PassRefPtrWillBeRawPtr<WebDataSourceImpl> WebDataSourceImpl::create(LocalFrame* frame, const ResourceRequest& request, const SubstituteData& data)
 {
     return adoptRefWillBeNoop(new WebDataSourceImpl(frame, request, data));
 }
 
 const WebURLRequest& WebDataSourceImpl::originalRequest() const
 {
     m_originalRequestWrapper.bind(DocumentLoader::originalRequest());
@@ skipping 75 matching lines @@
     case NavigationTypeReload:
         return WebNavigationTypeReload;
     case NavigationTypeFormResubmitted:
         return WebNavigationTypeFormResubmitted;
     case NavigationTypeOther:
     default:
         return WebNavigationTypeOther;
     }
 }
 
-void WebDataSourceImpl::setNextPluginLoadObserver(PassOwnPtr<WebPluginLoadObserver> observer)
+void WebDataSourceImpl::setNextPluginLoadObserver(PassOwnPtrWillBeRawPtr<WebPluginLoadObserver> observer)
 {
     nextPluginLoadObserver() = observer;
 }
 
 WebDataSourceImpl::WebDataSourceImpl(LocalFrame* frame, const ResourceRequest& request, const SubstituteData& data)
     : DocumentLoader(frame, request, data)
 {
     if (!nextPluginLoadObserver())
         return;
     // When a new frame is created, it initially gets a data source for an
@@ skipping 17 matching lines @@
 {
     RefPtrWillBeRawPtr<DocumentLoader> protect(this);
 
     DocumentLoader::detachFromFrame();
     m_extraData.clear();
     m_pluginLoadObserver.clear();
 }
 
 DEFINE_TRACE(WebDataSourceImpl)
 {
+    visitor->trace(m_pluginLoadObserver);
     DocumentLoader::trace(visitor);
 }
 
 } // namespace blink