Changeset 156660 in webkit for trunk/Source/WebCore/page/Page.cpp

Timestamp:

Sep 30, 2013, 9:50:34 AM (12 years ago)

Author:

[email protected]

Message:

Convert a bunch of OwnPtrs on Page to std::unique_ptrs
​https://bugs.webkit.org/show_bug.cgi?id=122086

Reviewed by Darin Adler.

• loader/ProgressTracker.cpp:
• loader/ProgressTracker.h:
• page/Page.cpp:

(WebCore::Page::Page):
(WebCore::Page::setGroupName):
(WebCore::Page::initGroup):

• page/Page.h:
• page/PageGroup.cpp:

(WebCore::PageGroup::PageGroup):

• page/PageGroup.h:

File:

• trunk/Source/WebCore/page/Page.cpp (modified) (5 diffs)

trunk/Source/WebCore/page/Page.cpp

@@ -125 +125 @@
 
 Page::Page(PageClients& pageClients)
-    : m_chrome(createOwned<Chrome>(*this, *pageClients.chromeClient))
-    , m_dragCaretController(createOwned<DragCaretController>())
+    : m_chrome(std::make_unique<Chrome>(*this, *pageClients.chromeClient))
+    , m_dragCaretController(std::make_unique<DragCaretController>())
 #if ENABLE(DRAG_SUPPORT)
-    , m_dragController(createOwned<DragController>(*this, *pageClients.dragClient))
-#endif
-    , m_focusController(createOwned<FocusController>(*this))
+    , m_dragController(std::make_unique<DragController>(*this, *pageClients.dragClient))
+#endif
+    , m_focusController(std::make_unique<FocusController>(*this))
 #if ENABLE(CONTEXT_MENUS)
-    , m_contextMenuController(createOwned<ContextMenuController>(*this, *pageClients.contextMenuClient))
+    , m_contextMenuController(std::make_unique<ContextMenuController>(*this, *pageClients.contextMenuClient))
 #endif
 #if ENABLE(INSPECTOR)
@@ -141 +141 @@
 #endif
     , m_settings(Settings::create(this))
-    , m_progress(ProgressTracker::create())
-    , m_backForwardController(createOwned<BackForwardController>(*this, pageClients.backForwardClient))
+    , m_progress(std::make_unique<ProgressTracker>())
+    , m_backForwardController(std::make_unique<BackForwardController>(*this, pageClients.backForwardClient))
     , m_mainFrame(MainFrame::create(*this, *pageClients.loaderClientForMainFrame))
     , m_theme(RenderTheme::themeForPage(this))
@@ -186 +186 @@
     , m_alternativeTextClient(pageClients.alternativeTextClient)
     , m_scriptedAnimationsSuspended(false)
-    , m_pageThrottler(createOwned<PageThrottler>(*this))
-    , m_console(createOwned<PageConsole>(*this))
+    , m_pageThrottler(std::make_unique<PageThrottler>(*this))
+    , m_console(std::make_unique<PageConsole>(*this))
     , m_lastSpatialNavigationCandidatesCount(0) // NOTE: Only called from Internals for Spatial Navigation testing.
     , m_framesHandlingBeforeUnloadEvent(0)
@@ -441 +441 @@
         m_group = m_singlePageGroup.get();
     else {
-        m_singlePageGroup.clear();
+        m_singlePageGroup = nullptr;
         m_group = PageGroup::pageGroup(name);
         m_group->addPage(this);
@@ -456 +456 @@
     ASSERT(!m_singlePageGroup);
     ASSERT(!m_group);
-    m_singlePageGroup = PageGroup::create(this);
+    m_singlePageGroup = std::make_unique<PageGroup>(*this);
     m_group = m_singlePageGroup.get();
 }