Title: [211666] trunk/Source
- Revision
- 211666
- Author
- joep...@webkit.org
- Date
- 2017-02-03 21:18:18 -0800 (Fri, 03 Feb 2017)
Log Message
Unreviewed rollout of r211486, r211629.
Original change is not ideal and is causing issues.
Source/_javascript_Core:
* inspector/agents/InspectorHeapAgent.cpp:
(Inspector::SendGarbageCollectionEventsTask::SendGarbageCollectionEventsTask):
* runtime/InitializeThreading.cpp:
(JSC::initializeThreading):
Source/WebKit2:
* Shared/WebKit2Initialize.cpp:
(WebKit::InitializeWebKit2):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (211665 => 211666)
--- trunk/Source/_javascript_Core/ChangeLog 2017-02-04 03:23:53 UTC (rev 211665)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-02-04 05:18:18 UTC (rev 211666)
@@ -1,3 +1,14 @@
+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-03 JF Bastien <jfbast...@apple.com>
OSR entry: delay outer-loop compilation when at inner-loop
Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp (211665 => 211666)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp 2017-02-04 03:23:53 UTC (rev 211665)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorHeapAgent.cpp 2017-02-04 05:18:18 UTC (rev 211666)
@@ -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: trunk/Source/_javascript_Core/runtime/InitializeThreading.cpp (211665 => 211666)
--- trunk/Source/_javascript_Core/runtime/InitializeThreading.cpp 2017-02-04 03:23:53 UTC (rev 211665)
+++ trunk/Source/_javascript_Core/runtime/InitializeThreading.cpp 2017-02-04 05:18:18 UTC (rev 211666)
@@ -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: trunk/Source/WebKit2/ChangeLog (211665 => 211666)
--- trunk/Source/WebKit2/ChangeLog 2017-02-04 03:23:53 UTC (rev 211665)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-04 05:18:18 UTC (rev 211666)
@@ -1,3 +1,12 @@
+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-03 Daniel Bates <daba...@apple.com>
[Mac][WK2] Add SPI to override the Content Security Policy of a page
Modified: trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp (211665 => 211666)
--- trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp 2017-02-04 03:23:53 UTC (rev 211665)
+++ trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp 2017-02-04 05:18:18 UTC (rev 211666)
@@ -51,9 +51,9 @@
InitWebCoreThreadSystemInterface();
#endif
- WTF::initializeThreading();
+ JSC::initializeThreading();
WTF::initializeMainThread();
- JSC::initializeThreading();
+ RunLoop::initializeMainRunLoop();
#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
WebCore::initializeLogChannelsIfNecessary();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
