Title: [211737] branches/safari-603-branch/Source
- Revision
- 211737
- Author
- matthew_han...@apple.com
- Date
- 2017-02-06 10:59:19 -0800 (Mon, 06 Feb 2017)
Log Message
Merge r211666. rdar://problem/30167791
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/_javascript_Core/ChangeLog (211736 => 211737)
--- branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-02-06 18:55:56 UTC (rev 211736)
+++ branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-02-06 18:59:19 UTC (rev 211737)
@@ -1,3 +1,18 @@
+2017-02-06 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r211666. rdar://problem/30167791
+
+ 2017-02-03 Joseph Pecoraro <pecor...@apple.com>
+
+ Unreviewed rollout of r211486, r211629.
+
+ Original change is not ideal and is causing issues.
+
+ * inspector/agents/InspectorHeapAgent.cpp:
+ (Inspector::SendGarbageCollectionEventsTask::SendGarbageCollectionEventsTask):
+ * runtime/InitializeThreading.cpp:
+ (JSC::initializeThreading):
+
2017-02-05 Matthew Hanson <matthew_han...@apple.com>
Merge r211630. rdar://problem/30318237
Modified: branches/safari-603-branch/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp (211736 => 211737)
--- branches/safari-603-branch/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp 2017-02-06 18:55:56 UTC (rev 211736)
+++ branches/safari-603-branch/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp 2017-02-06 18:59:19 UTC (rev 211737)
@@ -61,7 +61,7 @@
SendGarbageCollectionEventsTask::SendGarbageCollectionEventsTask(HeapFrontendDispatcher& frontendDispatcher)
: m_frontendDispatcher(frontendDispatcher)
- , m_timer(RunLoop::main(), this, &SendGarbageCollectionEventsTask::timerFired)
+ , m_timer(RunLoop::current(), this, &SendGarbageCollectionEventsTask::timerFired)
{
}
Modified: branches/safari-603-branch/Source/_javascript_Core/runtime/InitializeThreading.cpp (211736 => 211737)
--- branches/safari-603-branch/Source/_javascript_Core/runtime/InitializeThreading.cpp 2017-02-06 18:55:56 UTC (rev 211736)
+++ branches/safari-603-branch/Source/_javascript_Core/runtime/InitializeThreading.cpp 2017-02-06 18:59:19 UTC (rev 211737)
@@ -43,7 +43,6 @@
#include "WriteBarrier.h"
#include <mutex>
#include <wtf/MainThread.h>
-#include <wtf/RunLoop.h>
#include <wtf/Threading.h>
#include <wtf/dtoa.h>
#include <wtf/dtoa/cached-powers.h>
@@ -60,7 +59,6 @@
WTF::double_conversion::initialize();
WTF::initializeThreading();
WTF::initializeGCThreads();
- RunLoop::initializeMainRunLoop();
Options::initialize();
if (Options::recordGCPauseTimes())
HeapStatistics::initialize();
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (211736 => 211737)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-06 18:55:56 UTC (rev 211736)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-06 18:59:19 UTC (rev 211737)
@@ -1,5 +1,18 @@
2017-02-06 Matthew Hanson <matthew_han...@apple.com>
+ Merge r211666. rdar://problem/30167791
+
+ 2017-02-03 Joseph Pecoraro <pecor...@apple.com>
+
+ Unreviewed rollout of r211486, r211629.
+
+ Original change is not ideal and is causing issues.
+
+ * Shared/WebKit2Initialize.cpp:
+ (WebKit::InitializeWebKit2):
+
+2017-02-06 Matthew Hanson <matthew_han...@apple.com>
+
Merge r211653. rdar://problem/29872943
2017-02-03 Chris Dumez <cdu...@apple.com>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
