Chromium Code Reviews| Index: Source/core/page/Page.cpp |
| diff --git a/Source/core/page/Page.cpp b/Source/core/page/Page.cpp |
| index 714d25bfc0378b22cfa7039145268e4a2d7118ca..9dd518c65eadf46ee63fc433a649fb87a80ff844 100644 |
| --- a/Source/core/page/Page.cpp |
| +++ b/Source/core/page/Page.cpp |
| @@ -83,7 +83,7 @@ HashSet<Page*>& Page::ordinaryPages() |
| void Page::networkStateChanged(bool online) |
| { |
| - Vector<RefPtr<LocalFrame> > frames; |
| + WillBeHeapVector<RefPtrWillBeMember<LocalFrame> > frames; |
| // Get all the frames of all the pages in all the page groups |
| HashSet<Page*>::iterator end = allPages().end(); |
| @@ -265,7 +265,7 @@ void Page::refreshPlugins(bool reload) |
| PluginData::refresh(); |
| - Vector<RefPtr<LocalFrame> > framesNeedingReload; |
| + WillBeHeapVector<RefPtrWillBeMember<LocalFrame> > framesNeedingReload; |
| HashSet<Page*>::iterator end = allPages().end(); |
| for (HashSet<Page*>::iterator it = allPages().begin(); it != end; ++it) { |
| @@ -568,7 +568,7 @@ void Page::didCommitLoad(LocalFrame* frame) |
| void Page::acceptLanguagesChanged() |
| { |
| - Vector< RefPtr<LocalFrame> > frames; |
| + WillBeHeapVector<RefPtrWillBeMember<LocalFrame> > frames; |
| // Even though we don't fire an event from here, the LocalDOMWindow's will fire |
| // an event so we keep the frames alive until we are done. |
| @@ -596,6 +596,7 @@ void Page::trace(Visitor* visitor) |
| #if ENABLE(OILPAN) |
| visitor->trace(m_dragCaretController); |
| visitor->trace(m_dragController); |
| + visitor->trace(m_focusController); |
| visitor->trace(m_contextMenuController); |
| visitor->trace(m_inspectorController); |
| visitor->trace(m_pointerLockController); |
| @@ -613,7 +614,7 @@ void Page::willBeDestroyed() |
| // Destroy inspector first, since it uses frame and view during destruction. |
| m_inspectorController->willBeDestroyed(); |
| - RefPtr<Frame> mainFrame = m_mainFrame; |
| + RefPtrWillBeRawPtr<Frame> mainFrame = m_mainFrame; |
| mainFrame->detach(); |
| @@ -636,9 +637,9 @@ void Page::willBeDestroyed() |
| #endif |
| m_chrome->willBeDestroyed(); |
| - m_mainFrame = 0; |
| if (m_validationMessageClient) |
| m_validationMessageClient->willBeDestroyed(); |
| + m_mainFrame = 0; |
|
haraken
2014/09/11 14:47:25
Nit: m_mainFrame = nullptr
sof
2014/09/12 14:47:40
Done.
|
| } |
| Page::PageClients::PageClients() |