Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(570)

Unified Diff: third_party/WebKit/Source/core/page/Page.cpp

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/page/Page.cpp
diff --git a/third_party/WebKit/Source/core/page/Page.cpp b/third_party/WebKit/Source/core/page/Page.cpp
index 9830726680bd6e665bae72239def21426e537d17..4469e1dbb07c38b012504d4388c1aa81223a955b 100644
--- a/third_party/WebKit/Source/core/page/Page.cpp
+++ b/third_party/WebKit/Source/core/page/Page.cpp
@@ -71,7 +71,7 @@ Page::PageSet& Page::ordinaryPages()
void Page::networkStateChanged(bool online)
{
- WillBeHeapVector<RefPtrWillBeMember<LocalFrame>> frames;
+ HeapVector<Member<LocalFrame>> frames;
// Get all the frames of all the pages in all the page groups
for (Page* page : allPages()) {
@@ -105,9 +105,9 @@ float deviceScaleFactor(LocalFrame* frame)
return page->deviceScaleFactor();
}
-PassOwnPtrWillBeRawPtr<Page> Page::createOrdinary(PageClients& pageClients)
+RawPtr<Page> Page::createOrdinary(PageClients& pageClients)
{
- OwnPtrWillBeRawPtr<Page> page = create(pageClients);
+ RawPtr<Page> page = create(pageClients);
ordinaryPages().add(page.get());
page->memoryPurgeController().registerClient(page.get());
return page.release();
@@ -282,7 +282,7 @@ void Page::unmarkAllTextMatches()
} while (frame);
}
-void Page::setValidationMessageClient(PassOwnPtrWillBeRawPtr<ValidationMessageClient> client)
+void Page::setValidationMessageClient(RawPtr<ValidationMessageClient> client)
{
m_validationMessageClient = client;
}
@@ -506,7 +506,7 @@ void Page::didCommitLoad(LocalFrame* frame)
void Page::acceptLanguagesChanged()
{
- WillBeHeapVector<RefPtrWillBeMember<LocalFrame>> frames;
+ HeapVector<Member<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.
@@ -568,7 +568,7 @@ void Page::willBeClosed()
void Page::willBeDestroyed()
{
- RefPtrWillBeRawPtr<Frame> mainFrame = m_mainFrame;
+ RawPtr<Frame> mainFrame = m_mainFrame;
mainFrame->detach(FrameDetachType::Remove);
@@ -611,6 +611,6 @@ Page::PageClients::~PageClients()
{
}
-template class CORE_TEMPLATE_EXPORT WillBeHeapSupplement<Page>;
+template class CORE_TEMPLATE_EXPORT HeapSupplement<Page>;
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698