Title: [255902] branches/safari-609-branch/Source/WebKit
- Revision
- 255902
- Author
- [email protected]
- Date
- 2020-02-05 21:11:53 -0800 (Wed, 05 Feb 2020)
Log Message
Revert changes on safari-609-branch related to rdar://problem/59161343
Changes were merged incorrectly. Cleaning up.
This reverts commit r255891 and commit r255772.
Modified Paths
Diff
Modified: branches/safari-609-branch/Source/WebKit/ChangeLog (255901 => 255902)
--- branches/safari-609-branch/Source/WebKit/ChangeLog 2020-02-06 05:07:12 UTC (rev 255901)
+++ branches/safari-609-branch/Source/WebKit/ChangeLog 2020-02-06 05:11:53 UTC (rev 255902)
@@ -100,66 +100,6 @@
2020-02-04 Russell Epstein <[email protected]>
- Cherry-pick r254873. rdar://problem/59161343
-
- Revert suppressesConnectionTerminationOnSystemChange part of r254081
- https://bugs.webkit.org/show_bug.cgi?id=205751
- <rdar://problem/58725096>
-
- There was an API client that still hadn't migrated to the replacement SPI.
-
- * NetworkProcess/NetworkProcess.h:
- (WebKit::NetworkProcess::suppressesConnectionTerminationOnSystemChange const):
- * NetworkProcess/NetworkProcessCreationParameters.cpp:
- (WebKit::NetworkProcessCreationParameters::encode const):
- (WebKit::NetworkProcessCreationParameters::decode):
- * NetworkProcess/NetworkProcessCreationParameters.h:
- * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
- (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
- * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
- (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
- * UIProcess/API/APIProcessPoolConfiguration.cpp:
- (API::ProcessPoolConfiguration::copy):
- * UIProcess/API/APIProcessPoolConfiguration.h:
- * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
- * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
- (-[_WKProcessPoolConfiguration suppressesConnectionTerminationOnSystemChange]):
- (-[_WKProcessPoolConfiguration setSuppressesConnectionTerminationOnSystemChange:]):
- * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
- (WebKit::WebProcessPool::platformInitializeNetworkProcess):
-
- git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254873 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
- 2020-01-21 Alex Christensen <[email protected]>
-
- Revert suppressesConnectionTerminationOnSystemChange part of r254081
- https://bugs.webkit.org/show_bug.cgi?id=205751
- <rdar://problem/58725096>
-
- There was an API client that still hadn't migrated to the replacement SPI.
-
- * NetworkProcess/NetworkProcess.h:
- (WebKit::NetworkProcess::suppressesConnectionTerminationOnSystemChange const):
- * NetworkProcess/NetworkProcessCreationParameters.cpp:
- (WebKit::NetworkProcessCreationParameters::encode const):
- (WebKit::NetworkProcessCreationParameters::decode):
- * NetworkProcess/NetworkProcessCreationParameters.h:
- * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
- (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
- * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
- (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
- * UIProcess/API/APIProcessPoolConfiguration.cpp:
- (API::ProcessPoolConfiguration::copy):
- * UIProcess/API/APIProcessPoolConfiguration.h:
- * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
- * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
- (-[_WKProcessPoolConfiguration suppressesConnectionTerminationOnSystemChange]):
- (-[_WKProcessPoolConfiguration setSuppressesConnectionTerminationOnSystemChange:]):
- * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
- (WebKit::WebProcessPool::platformInitializeNetworkProcess):
-
-2020-02-04 Russell Epstein <[email protected]>
-
Cherry-pick r255461. rdar://problem/59153618
Add WKNavigationDelegate SPI to disable TLS 1.0 and 1.1
Modified: branches/safari-609-branch/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h (255901 => 255902)
--- branches/safari-609-branch/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2020-02-06 05:07:12 UTC (rev 255901)
+++ branches/safari-609-branch/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2020-02-06 05:11:53 UTC (rev 255902)
@@ -121,6 +121,11 @@
bool isJITEnabled() const { return m_isJITEnabled; }
void setJITEnabled(bool enabled) { m_isJITEnabled = enabled; }
+#if PLATFORM(IOS_FAMILY)
+ const WTF::String& ctDataConnectionServiceType() const { return m_ctDataConnectionServiceType; }
+ void setCTDataConnectionServiceType(const WTF::String& ctDataConnectionServiceType) { m_ctDataConnectionServiceType = ctDataConnectionServiceType; }
+#endif
+
ProcessID presentingApplicationPID() const { return m_presentingApplicationPID; }
void setPresentingApplicationPID(ProcessID pid) { m_presentingApplicationPID = pid; }
@@ -174,6 +179,10 @@
bool m_shouldConfigureJSCForTesting { false };
bool m_isJITEnabled { true };
bool m_usesSingleWebProcess { false };
+
+#if PLATFORM(IOS_FAMILY)
+ WTF::String m_ctDataConnectionServiceType;
+#endif
#if PLATFORM(COCOA)
bool m_suppressesConnectionTerminationOnSystemChange { false };
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
