Changeset 176000 in webkit for trunk/Source/JavaScriptCore/heap/Heap.cpp

Timestamp:

Nov 11, 2014, 7:13:47 PM (11 years ago)

Author:

[email protected]

Message:

Remove IncrementalSweeper::create()
​https://bugs.webkit.org/show_bug.cgi?id=138243

Reviewed by Filip Pizlo.

As a step to use std::unique_ptr<> and std::make_unique<>, this patch removes
IncrementalSweeper::create(), then set constructor of IncrementalSweeper to public.
Now we begins to use std::make_unique<> to create IncrementalSweeper instance.

Source/JavaScriptCore:

• heap/Heap.cpp:

(JSC::Heap::Heap):
(JSC::Heap::setIncrementalSweeper):

• heap/Heap.h:
• heap/IncrementalSweeper.cpp:

(JSC::IncrementalSweeper::create): Deleted.

• heap/IncrementalSweeper.h:

Source/WebCore:

No new tests, no behavior changes.

• bindings/js/JSDOMWindowBase.cpp:

(WebCore::JSDOMWindowBase::commonVM):

• platform/ios/WebSafeIncrementalSweeperIOS.h:

File:

• trunk/Source/JavaScriptCore/heap/Heap.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -332 +332 @@
     , m_edenActivityCallback(m_fullActivityCallback)
 #endif
-    , m_sweeper(IncrementalSweeper::create(this))
+#if USE(CF)
+    , m_sweeper(std::make_unique<IncrementalSweeper>(this, CFRunLoopGetCurrent()))
+#else
+    , m_sweeper(std::make_unique<IncrementalSweeper>(this->vm()))
+#endif
     , m_deferralDepth(0)
 {
@@ -1283 +1287 @@
 }
 
-void Heap::setIncrementalSweeper(PassOwnPtr<IncrementalSweeper> sweeper)
-{
-    m_sweeper = sweeper;
+void Heap::setIncrementalSweeper(std::unique_ptr<IncrementalSweeper> sweeper)
+{
+    m_sweeper = WTF::move(sweeper);
 }