Index: Source/core/frame/LocalFrame.cpp |
diff --git a/Source/core/frame/LocalFrame.cpp b/Source/core/frame/LocalFrame.cpp |
index 34698bdd1486c398a563d46c2803a8c97185bd94..836b24a0f7c6e2aeca62eb13ed9df9ef538846fd 100644 |
--- a/Source/core/frame/LocalFrame.cpp |
+++ b/Source/core/frame/LocalFrame.cpp |
@@ -93,7 +93,7 @@ inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host, FrameO |
: Frame(client, host, owner) |
, m_loader(this) |
, m_navigationScheduler(this) |
- , m_script(adoptPtr(new ScriptController(this))) |
+ , m_script(ScriptController::create(this)) |
, m_editor(Editor::create(*this)) |
, m_spellChecker(SpellChecker::create(*this)) |
, m_selection(FrameSelection::create(this)) |
@@ -145,6 +145,7 @@ void LocalFrame::trace(Visitor* visitor) |
visitor->trace(m_destructionObservers); |
visitor->trace(m_loader); |
visitor->trace(m_navigationScheduler); |
+ visitor->trace(m_view); |
visitor->trace(m_pagePopupOwner); |
visitor->trace(m_editor); |
visitor->trace(m_spellChecker); |
@@ -201,7 +202,7 @@ void LocalFrame::detachView() |
m_view->prepareForDetach(); |
} |
-void LocalFrame::setView(PassRefPtr<FrameView> view) |
+void LocalFrame::setView(PassRefPtrWillBeRawPtr<FrameView> view) |
{ |
detachView(); |
@@ -215,6 +216,9 @@ void LocalFrame::setView(PassRefPtr<FrameView> view) |
eventHandler().clear(); |
+ if (m_view && !view) |
+ m_view->dispose(); |
+ |
m_view = view; |
if (m_view && isMainFrame() && !settings()->pinchVirtualViewportEnabled()) |
@@ -438,7 +442,7 @@ void LocalFrame::createView(const IntSize& viewportSize, const Color& background |
setView(nullptr); |
- RefPtr<FrameView> frameView; |
+ RefPtrWillBeRawPtr<FrameView> frameView = nullptr; |
if (isLocalRoot) { |
frameView = FrameView::create(this, viewportSize); |