Make the embedder responsible for creating the WebFrame

Source/web/WebHelperPluginImpl.cpp

 /*
  * Copyright (C) 2012 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 91 matching lines @@
     }
 
     WebHelperPluginImpl* m_widget;
 };
 
 // WebHelperPluginImpl ----------------------------------------------------------------
 
 WebHelperPluginImpl::WebHelperPluginImpl(WebWidgetClient* client)
     : m_widgetClient(client)
     , m_webView(0)
+    , m_mainFrame(0)
 {
     ASSERT(client);
 }
 
 WebHelperPluginImpl::~WebHelperPluginImpl()
 {
     ASSERT(!m_page);
 }
 
 bool WebHelperPluginImpl::initialize(const String& pluginType, const WebDocument& hostDocument, WebViewImpl* webView)
@@ skipping 14 matching lines @@
     // We must destroy the page now in case the host page is being destroyed, in
     // which case some of the objects the page depends on may have been
     // destroyed by the time this->close() is called asynchronously.
     destroyPage();
 
     // m_widgetClient might be 0 because this widget might be already closed.
     if (m_widgetClient) {
         // closeWidgetSoon() will call this->close() later.
         m_widgetClient->closeWidgetSoon();
     }
+    m_mainFrame->close();
 }
 
 void WebHelperPluginImpl::initializeFrame(WebFrameClient* client)
 {
     ASSERT(m_page);
-    RefPtr<WebFrameImpl> frame = WebFrameImpl::create(client);
-    frame->initializeAsMainFrame(m_page.get());
+    m_mainFrame = WebFrameImpl::create(client);
+    m_mainFrame->initializeAsMainFrame(m_page.get());
 }
 
 // Returns a pointer to the WebPlugin by finding the single <object> tag in the page.
 WebPlugin* WebHelperPluginImpl::getPlugin()
 {
     ASSERT(m_page);
 
     RefPtr<NodeList> objectElements = m_page->mainFrame()->document()->getElementsByTagName(WebCore::HTMLNames::objectTag.localName());
     ASSERT(objectElements && objectElements->length() == 1);
     if (!objectElements || objectElements->length() < 1)
@@ skipping 78 matching lines @@
     // A WebHelperPluginImpl instance usually has two references.
     //  - One owned by the instance itself. It represents the visible widget.
     //  - One owned by the hosting element. It's released when the hosting
     //    element asks the WebHelperPluginImpl to close.
     // We need them because the closing operation is asynchronous and the widget
     // can be closed while the hosting element is unaware of it.
     return adoptRef(new WebHelperPluginImpl(client)).leakRef();
 }
 
 } // namespace WebKit