Title: [230603] tags/Safari-606.1.13/Source/WebKit
- Revision
- 230603
- Author
- kocsen_ch...@apple.com
- Date
- 2018-04-12 16:19:02 -0700 (Thu, 12 Apr 2018)
Log Message
Revert r230359. rdar://problem/39396724
Modified Paths
Diff
Modified: tags/Safari-606.1.13/Source/WebKit/ChangeLog (230602 => 230603)
--- tags/Safari-606.1.13/Source/WebKit/ChangeLog 2018-04-12 22:32:40 UTC (rev 230602)
+++ tags/Safari-606.1.13/Source/WebKit/ChangeLog 2018-04-12 23:19:02 UTC (rev 230603)
@@ -1,5 +1,9 @@
2018-04-12 Kocsen Chung <kocsen_ch...@apple.com>
+ Revert r230359. rdar://problem/39396724
+
+2018-04-12 Kocsen Chung <kocsen_ch...@apple.com>
+
Cherry-pick r230560. rdar://problem/39025726
[iOS] Add a mechanism for holding Wi-Fi assertions
Modified: tags/Safari-606.1.13/Source/WebKit/Platform/IPC/Connection.h (230602 => 230603)
--- tags/Safari-606.1.13/Source/WebKit/Platform/IPC/Connection.h 2018-04-12 22:32:40 UTC (rev 230602)
+++ tags/Safari-606.1.13/Source/WebKit/Platform/IPC/Connection.h 2018-04-12 23:19:02 UTC (rev 230603)
@@ -32,7 +32,6 @@
#include "Encoder.h"
#include "HandleMessage.h"
#include "MessageReceiver.h"
-#include <WebCore/ScriptDisallowedScope.h>
#include <atomic>
#include <wtf/Condition.h>
#include <wtf/Deque.h>
@@ -388,9 +387,6 @@
{
COMPILE_ASSERT(T::isSync, SyncMessageExpected);
- RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(sendSyncOptions.contains(SendSyncOption::DoNotProcessIncomingMessagesWhenWaitingForSyncReply)
- || WebCore::ScriptDisallowedScope::isEventAllowedInMainThread());
-
uint64_t syncRequestID = 0;
std::unique_ptr<Encoder> encoder = createSyncMessageEncoder(T::receiverName(), T::name(), destinationID, syncRequestID);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
