Title: [211693] branches/safari-603-branch/Source/_javascript_Core
- Revision
- 211693
- Author
- matthew_han...@apple.com
- Date
- 2017-02-05 20:03:34 -0800 (Sun, 05 Feb 2017)
Log Message
Merge r211486. rdar://problem/30167791
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/_javascript_Core/ChangeLog (211692 => 211693)
--- branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-02-06 04:03:31 UTC (rev 211692)
+++ branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-02-06 04:03:34 UTC (rev 211693)
@@ -1,5 +1,25 @@
2017-02-02 Matthew Hanson <matthew_han...@apple.com>
+ Merge r211486. rdar://problem/30167791
+
+ 2017-02-01 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Use guaranteed RunLoop instead of RunLoop::current for dispatching inspector GC event
+ https://bugs.webkit.org/show_bug.cgi?id=167683
+ <rdar://problem/30167791>
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/agents/InspectorHeapAgent.cpp:
+ (Inspector::SendGarbageCollectionEventsTask::SendGarbageCollectionEventsTask):
+ Use RunLoop::main instead of RunLoop::current which may go away.
+
+ * runtime/InitializeThreading.cpp:
+ (JSC::initializeThreading):
+ Ensure RunLoop::main is initialized when using JSC APIs.
+
+2017-02-02 Matthew Hanson <matthew_han...@apple.com>
+
Merge r211463. rdar://problem/30296879
2017-01-31 Filip Pizlo <fpi...@apple.com>
Modified: branches/safari-603-branch/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp (211692 => 211693)
--- branches/safari-603-branch/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp 2017-02-06 04:03:31 UTC (rev 211692)
+++ branches/safari-603-branch/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp 2017-02-06 04:03:34 UTC (rev 211693)
@@ -61,7 +61,7 @@
SendGarbageCollectionEventsTask::SendGarbageCollectionEventsTask(HeapFrontendDispatcher& frontendDispatcher)
: m_frontendDispatcher(frontendDispatcher)
- , m_timer(RunLoop::current(), this, &SendGarbageCollectionEventsTask::timerFired)
+ , m_timer(RunLoop::main(), this, &SendGarbageCollectionEventsTask::timerFired)
{
}
Modified: branches/safari-603-branch/Source/_javascript_Core/runtime/InitializeThreading.cpp (211692 => 211693)
--- branches/safari-603-branch/Source/_javascript_Core/runtime/InitializeThreading.cpp 2017-02-06 04:03:31 UTC (rev 211692)
+++ branches/safari-603-branch/Source/_javascript_Core/runtime/InitializeThreading.cpp 2017-02-06 04:03:34 UTC (rev 211693)
@@ -32,17 +32,18 @@
#include "ExecutableAllocator.h"
#include "Heap.h"
#include "HeapStatistics.h"
-#include "Options.h"
#include "Identifier.h"
#include "JSDateMath.h"
#include "JSGlobalObject.h"
#include "JSLock.h"
#include "LLIntData.h"
+#include "Options.h"
#include "StructureIDTable.h"
#include "SuperSampler.h"
#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>
@@ -59,6 +60,7 @@
WTF::double_conversion::initialize();
WTF::initializeThreading();
WTF::initializeGCThreads();
+ RunLoop::initializeMainRunLoop();
Options::initialize();
if (Options::recordGCPauseTimes())
HeapStatistics::initialize();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
