Title: [218528] trunk/Source/WebKit2
- Revision
- 218528
- Author
- cdu...@apple.com
- Date
- 2017-06-19 20:17:05 -0700 (Mon, 19 Jun 2017)
Log Message
Regression(r217570): com.apple.WebKit.Networking crash at com.apple.WebKit: WebKit::ChildProcess::didReceiveInvalidMessage (Breaks 32-bit apps)
https://bugs.webkit.org/show_bug.cgi?id=173576
<rdar://problem/32416291>
Reviewed by Tim Horton.
The IPC encoding / decoding code cannot be architecture-specific because a 32bit UIProcess
talks to a 64bit NetworkProcess. The WEB_RTC build time flag is enabled on 64bit only.
Therefore, we should not use #if ENABLE(WEB_RTC) in IPC encoding / decoding code.
* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::encode):
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageCreationParameters.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (218527 => 218528)
--- trunk/Source/WebKit2/ChangeLog 2017-06-20 03:14:30 UTC (rev 218527)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-20 03:17:05 UTC (rev 218528)
@@ -1,5 +1,22 @@
2017-06-19 Chris Dumez <cdu...@apple.com>
+ Regression(r217570): com.apple.WebKit.Networking crash at com.apple.WebKit: WebKit::ChildProcess::didReceiveInvalidMessage (Breaks 32-bit apps)
+ https://bugs.webkit.org/show_bug.cgi?id=173576
+ <rdar://problem/32416291>
+
+ Reviewed by Tim Horton.
+
+ The IPC encoding / decoding code cannot be architecture-specific because a 32bit UIProcess
+ talks to a 64bit NetworkProcess. The WEB_RTC build time flag is enabled on 64bit only.
+ Therefore, we should not use #if ENABLE(WEB_RTC) in IPC encoding / decoding code.
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+
+2017-06-19 Chris Dumez <cdu...@apple.com>
+
Unreviewed, partial rollout of r218501 to address crashes on iOS.
* UIProcess/Cocoa/NavigationState.mm:
Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp (218527 => 218528)
--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2017-06-20 03:14:30 UTC (rev 218527)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2017-06-20 03:17:05 UTC (rev 218528)
@@ -97,12 +97,8 @@
encoder << overrideContentSecurityPolicy;
encoder << cpuLimit;
encoder << urlSchemeHandlers;
-#if ENABLE(WEB_RTC)
encoder << iceCandidateFilteringEnabled;
-#if USE(LIBWEBRTC)
encoder << enumeratingAllNetworkInterfacesEnabled;
-#endif
-#endif
encoder << userContentWorlds;
encoder << userScripts;
encoder << userStyleSheets;
@@ -243,14 +239,12 @@
if (!decoder.decode(parameters.urlSchemeHandlers))
return false;
-#if ENABLE(WEB_RTC)
if (!decoder.decode(parameters.iceCandidateFilteringEnabled))
return false;
-#if USE(LIBWEBRTC)
+
if (!decoder.decode(parameters.enumeratingAllNetworkInterfacesEnabled))
return false;
-#endif
-#endif
+
if (!decoder.decode(parameters.userContentWorlds))
return false;
if (!decoder.decode(parameters.userScripts))
Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.h (218527 => 218528)
--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2017-06-20 03:14:30 UTC (rev 218527)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2017-06-20 03:17:05 UTC (rev 218528)
@@ -153,12 +153,9 @@
HashMap<String, uint64_t> urlSchemeHandlers;
-#if ENABLE(WEB_RTC)
+ // WebRTC members.
bool iceCandidateFilteringEnabled { true };
-#if USE(LIBWEBRTC)
bool enumeratingAllNetworkInterfacesEnabled { false };
-#endif
-#endif
// UserContentController members
Vector<std::pair<uint64_t, String>> userContentWorlds;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
