diff options
Diffstat (limited to 'Source/web/WebHelperPluginImpl.cpp')
| -rw-r--r-- | Source/web/WebHelperPluginImpl.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/web/WebHelperPluginImpl.cpp b/Source/web/WebHelperPluginImpl.cpp index 8c8197482..4520beab6 100644 --- a/Source/web/WebHelperPluginImpl.cpp +++ b/Source/web/WebHelperPluginImpl.cpp @@ -44,7 +44,7 @@ #include "core/loader/DocumentLoader.h" #include "core/loader/EmptyClients.h" #include "core/page/FocusController.h" -#include "core/page/FrameView.h" +#include "core/frame/FrameView.h" #include "core/page/Page.h" #include "core/page/Settings.h" @@ -109,6 +109,7 @@ private: WebHelperPluginImpl::WebHelperPluginImpl(WebWidgetClient* client) : m_widgetClient(client) , m_webView(0) + , m_mainFrame(0) { ASSERT(client); } @@ -143,13 +144,14 @@ void WebHelperPluginImpl::closeHelperPlugin() // 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. @@ -188,9 +190,6 @@ bool WebHelperPluginImpl::initializePage(const String& pluginType, const WebDocu ASSERT(!m_page->settings().isScriptEnabled()); m_page->settings().setPluginsEnabled(true); - unsigned layoutMilestones = DidFirstLayout | DidFirstVisuallyNonEmptyLayout; - m_page->addLayoutMilestones(static_cast<LayoutMilestones>(layoutMilestones)); - m_webView->client()->initializeHelperPluginWebFrame(this); // The page's main frame was set in initializeFrame() as a result of the above call. |