Changeset 211693 in webkit

Timestamp:

Feb 5, 2017 8:03:34 PM (7 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r211486. rdar://problem/30167791

Location:

branches/safari-603-branch/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/agents/InspectorHeapAgent.cpp (modified) (1 diff)
• runtime/InitializeThreading.cpp (modified) (4 diffs)

branches/safari-603-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-02-02  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r211486. rdar://problem/30167791
+
+    2017-02-01  Joseph Pecoraro  <pecoraro@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_hanson@apple.com>
 

branches/safari-603-branch/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp

@@ -62 +62 @@
 SendGarbageCollectionEventsTask::SendGarbageCollectionEventsTask(HeapFrontendDispatcher& frontendDispatcher)
     : m_frontendDispatcher(frontendDispatcher)
-    , m_timer(RunLoop::current(), this, &SendGarbageCollectionEventsTask::timerFired)
+    , m_timer(RunLoop::main(), this, &SendGarbageCollectionEventsTask::timerFired)
 {
 }

branches/safari-603-branch/Source/JavaScriptCore/runtime/InitializeThreading.cpp

@@ -33 +33 @@
 #include "Heap.h"
 #include "HeapStatistics.h"
-#include "Options.h"
 #include "Identifier.h"
 #include "JSDateMath.h"
@@ -39 +38 @@
 #include "JSLock.h"
 #include "LLIntData.h"
+#include "Options.h"
 #include "StructureIDTable.h"
 #include "SuperSampler.h"
@@ -44 +44 @@
 #include <mutex>
 #include <wtf/MainThread.h>
+#include <wtf/RunLoop.h>
 #include <wtf/Threading.h>
 #include <wtf/dtoa.h>
@@ -60 +61 @@
         WTF::initializeThreading();
         WTF::initializeGCThreads();
+        RunLoop::initializeMainRunLoop();
         Options::initialize();
         if (Options::recordGCPauseTimes())